diff --git a/integration_test/mocks/iap_products_mock.dart b/integration_test/mocks/iap_products_mock.dart
index 1a67c69..1a79bc2 100644
--- a/integration_test/mocks/iap_products_mock.dart
+++ b/integration_test/mocks/iap_products_mock.dart
@@ -27,7 +27,7 @@ class MockIAPProductsProviderState extends State<MockIAPProductsProvider> {
         IAPProduct(
           storeId: IAPProductType.paidFeatures.storeId,
           status: _purchased ? IAPProductStatus.purchased : IAPProductStatus.purchasable,
-        )
+        ),
       ]),
       child: widget.child,
     );
diff --git a/lib/data/models/metering_screen_layout_config.dart b/lib/data/models/metering_screen_layout_config.dart
index 7d550e4..a558202 100644
--- a/lib/data/models/metering_screen_layout_config.dart
+++ b/lib/data/models/metering_screen_layout_config.dart
@@ -23,7 +23,7 @@ extension MeteringScreenLayoutConfigJson on MeteringScreenLayoutConfig {
 
     return <MeteringScreenLayoutFeature, bool>{
       for (final f in MeteringScreenLayoutFeature.values)
-        f: (data[migratedIndex(f).toString()] ?? data[f.name]) as bool? ?? true
+        f: (data[migratedIndex(f).toString()] ?? data[f.name]) as bool? ?? true,
     };
   }
 
diff --git a/lib/screens/metering/components/camera_container/components/camera_preview/widget_camera_preview.dart b/lib/screens/metering/components/camera_container/components/camera_preview/widget_camera_preview.dart
index 0164a35..fe61bed 100644
--- a/lib/screens/metering/components/camera_container/components/camera_preview/widget_camera_preview.dart
+++ b/lib/screens/metering/components/camera_container/components/camera_preview/widget_camera_preview.dart
@@ -117,7 +117,7 @@ class _CameraPreviewBuilderState extends State<_CameraPreviewBuilder> {
                     context,
                     CameraFeature.spotMetering,
                   ))
-                    CameraSpotDetector(onSpotTap: widget.onSpotTap)
+                    CameraSpotDetector(onSpotTap: widget.onSpotTap),
                 ],
               ],
             )
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 3e81d48..ceaca91 100644
--- a/lib/screens/metering/components/camera_container/widget_container_camera.dart
+++ b/lib/screens/metering/components/camera_container/widget_container_camera.dart
@@ -97,7 +97,7 @@ class CameraContainer extends StatelessWidget {
               ),
             ],
           ),
-        )
+        ),
       ],
     );
   }
diff --git a/lib/screens/metering/components/shared/metering_top_bar/widget_top_bar_metering.dart b/lib/screens/metering/components/shared/metering_top_bar/widget_top_bar_metering.dart
index a005b85..f1fef15 100644
--- a/lib/screens/metering/components/shared/metering_top_bar/widget_top_bar_metering.dart
+++ b/lib/screens/metering/components/shared/metering_top_bar/widget_top_bar_metering.dart
@@ -42,7 +42,7 @@ class MeteringTopBar extends StatelessWidget {
                       child: preview,
                     ),
                   ),
-                ]
+                ],
               ],
             ),
           ),
diff --git a/lib/screens/metering/components/shared/readings_container/components/shared/reading_value_container/widget_container_reading_value.dart b/lib/screens/metering/components/shared/readings_container/components/shared/reading_value_container/widget_container_reading_value.dart
index 6968db6..0abc0f4 100644
--- a/lib/screens/metering/components/shared/readings_container/components/shared/reading_value_container/widget_container_reading_value.dart
+++ b/lib/screens/metering/components/shared/readings_container/components/shared/reading_value_container/widget_container_reading_value.dart
@@ -92,7 +92,7 @@ class _ReadingValueBuilder extends StatelessWidget {
             overflow: TextOverflow.ellipsis,
             softWrap: false,
           ),
-        )
+        ),
       ],
     );
   }
diff --git a/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart b/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart
index 56c4ed0..57b1316 100644
--- a/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart
+++ b/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart
@@ -120,7 +120,7 @@ class _CalibrationUnit extends StatelessWidget {
               tooltip: S.of(context).tooltipResetToZero,
             ),
           ],
-        )
+        ),
       ],
     );
   }
diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart
index 6879a2c..9f3cf5a 100644
--- a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart
+++ b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart
@@ -41,7 +41,7 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
               SliverFillRemaining(
                 hasScrollBody: false,
                 child: _EquipmentProfilesListPlaceholder(onTap: _addProfile),
-              )
+              ),
             ]
           : [
               SliverList(
diff --git a/lib/screens/settings/components/shared/dialog_filter/widget_dialog_filter.dart b/lib/screens/settings/components/shared/dialog_filter/widget_dialog_filter.dart
index eb03e23..374c8d7 100644
--- a/lib/screens/settings/components/shared/dialog_filter/widget_dialog_filter.dart
+++ b/lib/screens/settings/components/shared/dialog_filter/widget_dialog_filter.dart
@@ -135,7 +135,7 @@ class _DialogFilterState<T> extends State<DialogFilter<T>> {
                   ),
                 ],
               ),
-            )
+            ),
           ],
         ),
       ),
diff --git a/lib/screens/settings/components/shared/dialog_switch/widget_dialog_switch.dart b/lib/screens/settings/components/shared/dialog_switch/widget_dialog_switch.dart
index fdf7cc5..dc43017 100644
--- a/lib/screens/settings/components/shared/dialog_switch/widget_dialog_switch.dart
+++ b/lib/screens/settings/components/shared/dialog_switch/widget_dialog_switch.dart
@@ -51,7 +51,7 @@ class _DialogSwitchState<T> extends State<DialogSwitch<T>> {
                 padding: const EdgeInsets.symmetric(horizontal: Dimens.paddingL),
                 child: Text(widget.description!),
               ),
-              const SizedBox(height: Dimens.grid16)
+              const SizedBox(height: Dimens.grid16),
             ],
             ListView(
               shrinkWrap: true,
diff --git a/test/providers/films_provider_test.dart b/test/providers/films_provider_test.dart
index 760ca43..47c35c1 100644
--- a/test/providers/films_provider_test.dart
+++ b/test/providers/films_provider_test.dart
@@ -26,7 +26,7 @@ void main() {
           IAPProduct(
             storeId: IAPProductType.paidFeatures.storeId,
             status: productStatus,
-          )
+          ),
         ],
         child: FilmsProvider(
           storageService: mockIAPStorageService,
diff --git a/test/providers/user_preferences_provider_test.dart b/test/providers/user_preferences_provider_test.dart
index 1a91419..3ea3fc3 100644
--- a/test/providers/user_preferences_provider_test.dart
+++ b/test/providers/user_preferences_provider_test.dart
@@ -317,7 +317,7 @@ void main() {
                 onPressed: () => UserPreferencesProvider.of(context).setThemeType(ThemeType.dark),
                 child: Text('${UserPreferencesProvider.themeTypeOf(context)}'),
               ),
-              Text('${Theme.of(context).colorScheme.brightness}')
+              Text('${Theme.of(context).colorScheme.brightness}'),
             ],
           ),
         );
@@ -344,7 +344,7 @@ void main() {
                 onPressed: () => UserPreferencesProvider.of(context).setThemeType(ThemeType.systemDefault),
                 child: Text('${UserPreferencesProvider.themeTypeOf(context)}'),
               ),
-              Text('${Theme.of(context).colorScheme.brightness}')
+              Text('${Theme.of(context).colorScheme.brightness}'),
             ],
           ),
         );
diff --git a/test/screens/metering/components/shared/readings_container/equipment_profile_picker_test.dart b/test/screens/metering/components/shared/readings_container/equipment_profile_picker_test.dart
index 6853168..731ce4e 100644
--- a/test/screens/metering/components/shared/readings_container/equipment_profile_picker_test.dart
+++ b/test/screens/metering/components/shared/readings_container/equipment_profile_picker_test.dart
@@ -28,7 +28,7 @@ void main() {
           IAPProduct(
             storeId: IAPProductType.paidFeatures.storeId,
             status: IAPProductStatus.purchased,
-          )
+          ),
         ],
         child: EquipmentProfileProvider(
           storageService: mockIAPStorageService,
diff --git a/test/screens/metering/components/shared/readings_container/film_picker_test.dart b/test/screens/metering/components/shared/readings_container/film_picker_test.dart
index 19f4840..03f50ed 100644
--- a/test/screens/metering/components/shared/readings_container/film_picker_test.dart
+++ b/test/screens/metering/components/shared/readings_container/film_picker_test.dart
@@ -27,7 +27,7 @@ void main() {
           IAPProduct(
             storeId: IAPProductType.paidFeatures.storeId,
             status: IAPProductStatus.purchased,
-          )
+          ),
         ],
         child: FilmsProvider(
           storageService: mockIAPStorageService,
diff --git a/test_driver/utils/grant_camera_permission.dart b/test_driver/utils/grant_camera_permission.dart
index c6f56d7..06c6607 100644
--- a/test_driver/utils/grant_camera_permission.dart
+++ b/test_driver/utils/grant_camera_permission.dart
@@ -26,7 +26,7 @@ Future<void> grantCameraPermission() async {
       'pm',
       'grant',
       'com.vodemn.lightmeter.dev',
-      'android.permission.CAMERA'
+      'android.permission.CAMERA',
     ]);
   } catch (e) {
     log('Error occured: $e');