.github/workflows/pr_check.yml

@@ -12,9 +12,9 @@ on:
     branches: ["main"]
 
 jobs:
-  analyze-and-test:
+  analyze_and_test:
     name: Analyze & test
-    runs-on: macos-14
+    runs-on: macos-11
     timeout-minutes: 10
     steps:
       - uses: 8BitJonny/gh-get-current-pr@2.2.0
@@ -54,13 +54,11 @@ jobs:
         run: flutter analyze lib --fatal-infos
 
       - name: Run tests
-        run: |
+        run: flutter test
-          defaults -currentHost write -g AppleFontSmoothing -int 0
-          flutter test --dart-define cameraStubImage=assets/camera_stub_image.jpg
 
       - name: Analyze project source with stub
         if: steps.override-iap.conclusion != 'success'
         run: |
           bash ./.github/scripts/stub_iap.sh
           flutter pub get
-          flutter analyze lib --fatal-infos
+          flutter analyze lib --fatal-infos

.gitignore

@@ -62,5 +62,4 @@ ios/Runner/GoogleService-Info.plist
 
 coverage/
 test/coverage_helper_test.dart
-**/failures/*.png
 screenshots/generated/

dart_test.yaml

@@ -1,2 +0,0 @@
-tags:
-  golden:

lib/data/light_sensor_service.dart

@@ -7,7 +7,7 @@ class LightSensorService {
   const LightSensorService(this.localPlatform);
 
   Future<bool> hasSensor() async {
-    if (localPlatform.isIOS) {
+    if (!localPlatform.isAndroid) {
       return false;
     }
     try {
@@ -18,7 +18,7 @@ class LightSensorService {
   }
 
   Stream<int> luxStream() {
-    if (localPlatform.isIOS) {
+    if (!localPlatform.isAndroid) {
       return const Stream<int>.empty();
     }
     return LightSensor.luxStream();

lib/screens/shared/ruler_slider/widget_slider_ruler.dart

@@ -77,48 +77,43 @@ class _Ruler extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final mainTicksFontSize = Theme.of(context).textTheme.bodySmall!.fontSize!;
     return LayoutBuilder(
       builder: (context, constraints) {
-        final bool showAllMainTicks =
+        final bool showAllMainTicks = Dimens.cameraSliderHandleArea * mainTicksCount <= constraints.maxHeight;
-            mainTicksFontSize * mainTicksCount + (1 * mainTicksCount - 1) <= constraints.maxHeight;
+        return Column(
-        return Padding(
+          crossAxisAlignment: CrossAxisAlignment.end,
-          padding: EdgeInsets.symmetric(vertical: (Dimens.cameraSliderHandleArea - mainTicksFontSize) / 2),
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          child: Column(
+          children: List.generate(
-            crossAxisAlignment: CrossAxisAlignment.end,
+            itemsCount,
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            (index) {
-            children: List.generate(
+              final bool isMainTick = index % 2 == 0.0;
-              itemsCount,
+              if (!showAllMainTicks && !isMainTick) {
-              (index) {
+                return const SizedBox();
-                final bool isMainTick = index % 2 == 0.0;
+              }
-                if (!showAllMainTicks && !isMainTick) {
+              final bool showValue = (index % (showAllMainTicks ? 2 : 4) == 0.0);
-                  return const SizedBox();
+              return SizedBox(
-                }
+                height: index == itemsCount - 1 || showValue ? Dimens.cameraSliderHandleArea : 1,
-                final bool showValue = (index % (showAllMainTicks ? 2 : 4) == 0.0);
+                child: Row(
-                return SizedBox(
+                  mainAxisAlignment: MainAxisAlignment.end,
-                  height: index == itemsCount - 1 || showValue ? mainTicksFontSize : 1,
+                  children: [
-                  child: Row(
+                    if (showValue)
-                    mainAxisAlignment: MainAxisAlignment.end,
+                      Text(
-                    children: [
+                        rulerValueAdapter(index / 2 + min),
-                      if (showValue)
+                        style: Theme.of(context).textTheme.bodySmall,
-                        Text(
-                          rulerValueAdapter(index / 2 + min),
-                          style: Theme.of(context).textTheme.bodySmall,
-                        ),
-                      const SizedBox(width: Dimens.grid4),
-                      ColoredBox(
-                        color: Theme.of(context).colorScheme.onBackground,
-                        child: SizedBox(
-                          height: 1,
-                          width: isMainTick ? Dimens.grid8 : Dimens.grid4,
-                        ),
                       ),
-                    ],
+                    const SizedBox(width: Dimens.grid4),
-                  ),
+                    ColoredBox(
-                );
+                      color: Theme.of(context).colorScheme.onBackground,
-              },
+                      child: SizedBox(
-            ).reversed.toList(),
+                        height: 1,
-          ),
+                        width: isMainTick ? Dimens.grid8 : Dimens.grid4,
+                      ),
+                    ),
+                  ],
+                ),
+              );
+            },
+          ).reversed.toList(),
         );
       },
     );

pubspec.yaml

@@ -49,7 +49,6 @@ dev_dependencies:
   flutter_native_splash: 2.3.5
   flutter_test:
     sdk: flutter
-  golden_toolkit: 0.15.0
   google_fonts: 3.0.1
   integration_test:
     sdk: flutter

test/application_mock.dart

@@ -1,23 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:light_sensor/light_sensor.dart';
-import 'package:lightmeter/application_wrapper.dart';
-import 'package:lightmeter/data/models/supported_locale.dart';
-import 'package:lightmeter/environment.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/res/theme.dart';
 import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
 
-import '../integration_test/mocks/paid_features_mock.dart';
-import '../integration_test/utils/platform_channel_mock.dart';
-
 /// Provides [MaterialApp] with default theme and "en" localization
 class WidgetTestApplicationMock extends StatelessWidget {
+  final IAPProductStatus productStatus;
   final Widget child;
 
   const WidgetTestApplicationMock({
+    this.productStatus = IAPProductStatus.purchased,
     required this.child,
     super.key,
   });
@@ -42,86 +35,3 @@ class WidgetTestApplicationMock extends StatelessWidget {
     );
   }
 }
-
-class GoldenTestApplicationMock extends StatefulWidget {
-  final IAPProductStatus productStatus;
-  final Widget child;
-
-  const GoldenTestApplicationMock({
-    this.productStatus = IAPProductStatus.purchased,
-    required this.child,
-    super.key,
-  });
-
-  @override
-  State<GoldenTestApplicationMock> createState() => _GoldenTestApplicationMockState();
-}
-
-class _GoldenTestApplicationMockState extends State<GoldenTestApplicationMock> {
-  @override
-  void initState() {
-    super.initState();
-    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
-      LightSensor.methodChannel,
-      (methodCall) async {
-        switch (methodCall.method) {
-          case "sensor":
-            return true;
-          default:
-            return null;
-        }
-      },
-    );
-    setupLightSensorStreamHandler();
-  }
-
-  @override
-  void dispose() {
-    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
-      LightSensor.methodChannel,
-      null,
-    );
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return IAPProducts(
-      products: [
-        IAPProduct(
-          storeId: IAPProductType.paidFeatures.storeId,
-          status: widget.productStatus,
-        ),
-      ],
-      child: ApplicationWrapper(
-        const Environment.dev(),
-        child: MockIAPProviders(
-          equipmentProfiles: mockEquipmentProfiles,
-          selectedEquipmentProfileId: mockEquipmentProfiles.first.id,
-          films: films,
-          child: Builder(
-            builder: (context) {
-              return MaterialApp(
-                debugShowCheckedModeBanner: false,
-                theme: UserPreferencesProvider.themeOf(context),
-                locale: Locale(UserPreferencesProvider.localeOf(context).intlName),
-                localizationsDelegates: const [
-                  S.delegate,
-                  GlobalMaterialLocalizations.delegate,
-                  GlobalWidgetsLocalizations.delegate,
-                  GlobalCupertinoLocalizations.delegate,
-                ],
-                supportedLocales: S.delegate.supportedLocales,
-                builder: (context, child) => MediaQuery(
-                  data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
-                  child: child!,
-                ),
-                home: widget.child,
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-}

test/data/light_sensor_service_test.dart

@@ -44,19 +44,19 @@ void main() {
       });
 
       test('true - Android', () async {
-        when(() => localPlatform.isIOS).thenReturn(false);
+        when(() => localPlatform.isAndroid).thenReturn(true);
         setMockSensorAvailability(hasSensor: true);
         expectLater(service.hasSensor(), completion(true));
       });
 
       test('false - Android', () async {
-        when(() => localPlatform.isIOS).thenReturn(false);
+        when(() => localPlatform.isAndroid).thenReturn(true);
         setMockSensorAvailability(hasSensor: false);
         expectLater(service.hasSensor(), completion(false));
       });
 
       test('false - iOS', () async {
-        when(() => localPlatform.isIOS).thenReturn(true);
+        when(() => localPlatform.isAndroid).thenReturn(false);
         expectLater(service.hasSensor(), completion(false));
       });
     },
@@ -64,7 +64,7 @@ void main() {
 
   group('luxStream', () {
     test('Android', () async {
-      when(() => localPlatform.isIOS).thenReturn(false);
+      when(() => localPlatform.isAndroid).thenReturn(true);
       final stream = service.luxStream();
       final List<int> result = [];
       final subscription = stream.listen(result.add);
@@ -77,7 +77,7 @@ void main() {
     });
 
     test('iOS', () async {
-      when(() => localPlatform.isIOS).thenReturn(true);
+      when(() => localPlatform.isAndroid).thenReturn(false);
       expect(service.luxStream(), const Stream<int>.empty());
     });
   });

test/flutter_test_config.dart

@@ -1,47 +0,0 @@
-import 'dart:async';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/widgets.dart';
-import 'package:golden_toolkit/golden_toolkit.dart';
-
-Future<void> testExecutable(FutureOr<void> Function() testMain) async {
-  return GoldenToolkit.runWithConfiguration(
-    () async {
-      await loadAppFonts();
-      await testMain();
-    },
-    config: GoldenToolkitConfiguration(
-      defaultDevices: _defaultDevices +
-          _defaultDevices
-              .map(
-                (d) => Device(
-                  name: '${d.name} (Dark)',
-                  size: d.size,
-                  devicePixelRatio: d.devicePixelRatio,
-                  safeArea: d.safeArea,
-                  brightness: Brightness.dark,
-                ),
-              )
-              .toList(),
-    ),
-  );
-}
-
-const _defaultDevices = <Device>[
-  Device(
-    name: 'iPhone 8',
-    size: Size(375, 667),
-    devicePixelRatio: 2.0,
-  ),
-  Device(
-    name: 'iPhone 13 Pro',
-    size: Size(390, 844),
-    devicePixelRatio: 3.0,
-    safeArea: EdgeInsets.only(top: 44, bottom: 34),
-  ),
-  Device(
-    name: 'iPhone 15 Pro Max',
-    size: Size(430, 932),
-    devicePixelRatio: 3.0,
-    safeArea: EdgeInsets.only(top: 44, bottom: 34),
-  ),
-];

test/screens/metering/screen_metering_golden_test.dart

@@ -1,144 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/widgets.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:golden_toolkit/golden_toolkit.dart';
-import 'package:lightmeter/data/models/ev_source_type.dart';
-import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
-import 'package:lightmeter/data/models/theme_type.dart';
-import 'package:lightmeter/data/shared_prefs_service.dart';
-import 'package:lightmeter/providers/user_preferences_provider.dart';
-import 'package:lightmeter/screens/metering/components/bottom_controls/components/measure_button/widget_button_measure.dart';
-import 'package:lightmeter/screens/metering/flow_metering.dart';
-import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-import '../../../integration_test/utils/platform_channel_mock.dart';
-import '../../application_mock.dart';
-
-class _MeteringScreenConfig {
-  final IAPProductStatus iapProductStatus;
-  final EvSourceType evSourceType;
-
-  _MeteringScreenConfig(
-    this.iapProductStatus,
-    this.evSourceType,
-  );
-
-  @override
-  String toString() {
-    final buffer = StringBuffer();
-    buffer.write(iapProductStatus.toString().split('.')[1]);
-    buffer.write(' - ');
-    buffer.write(evSourceType.toString().split('.')[1]);
-    return buffer.toString();
-  }
-}
-
-final _testScenarios = [IAPProductStatus.purchased, IAPProductStatus.purchasable].expand(
-  (iapProductStatus) => EvSourceType.values.map(
-    (evSourceType) => _MeteringScreenConfig(iapProductStatus, evSourceType),
-  ),
-);
-
-void main() {
-  Future<void> setEvSource(WidgetTester tester, Key scenarioWidgetKey, EvSourceType evSourceType) async {
-    final flow = find.descendant(
-      of: find.byKey(scenarioWidgetKey),
-      matching: find.byType(MeteringFlow),
-    );
-    final BuildContext context = tester.element(flow);
-    if (UserPreferencesProvider.evSourceTypeOf(context) != evSourceType) {
-      UserPreferencesProvider.of(context).toggleEvSourceType();
-    }
-    await tester.pumpAndSettle();
-  }
-
-  Future<void> setTheme(WidgetTester tester, Key scenarioWidgetKey, ThemeType themeType) async {
-    final flow = find.descendant(
-      of: find.byKey(scenarioWidgetKey),
-      matching: find.byType(MeteringFlow),
-    );
-    final BuildContext context = tester.element(flow);
-    UserPreferencesProvider.of(context).setThemeType(themeType);
-    await tester.pumpAndSettle();
-  }
-
-  Future<void> takePhoto(WidgetTester tester, Key scenarioWidgetKey) async {
-    final button = find.descendant(
-      of: find.byKey(scenarioWidgetKey),
-      matching: find.byType(MeteringMeasureButton),
-    );
-    await tester.tap(button);
-    await tester.pump(const Duration(seconds: 2)); // wait for circular progress indicator
-    await tester.pump(const Duration(seconds: 1)); // wait for circular progress indicator
-    await tester.pumpAndSettle();
-  }
-
-  Future<void> toggleIncidentMetering(WidgetTester tester, Key scenarioWidgetKey, double ev) async {
-    final button = find.descendant(
-      of: find.byKey(scenarioWidgetKey),
-      matching: find.byType(MeteringMeasureButton),
-    );
-    await tester.tap(button);
-    await sendMockIncidentEv(ev);
-    await tester.tap(button);
-    await tester.pumpAndSettle();
-  }
-
-  setUpAll(() {
-    SharedPreferences.setMockInitialValues({
-      UserPreferencesService.evSourceTypeKey: EvSourceType.camera.index,
-      UserPreferencesService.meteringScreenLayoutKey: json.encode(
-        {
-          MeteringScreenLayoutFeature.equipmentProfiles: true,
-          MeteringScreenLayoutFeature.extremeExposurePairs: true,
-          MeteringScreenLayoutFeature.filmPicker: true,
-        }.toJson(),
-      ),
-    });
-  });
-
-  testGoldens(
-    'MeteringScreen golden test',
-    (tester) async {
-      final builder = DeviceBuilder();
-      for (final scenario in _testScenarios) {
-        builder.addScenario(
-          name: scenario.toString(),
-          widget: _MockMeteringFlow(productStatus: scenario.iapProductStatus),
-          onCreate: (scenarioWidgetKey) async {
-            await setEvSource(tester, scenarioWidgetKey, scenario.evSourceType);
-            if (scenarioWidgetKey.toString().contains('Dark')) {
-              await setTheme(tester, scenarioWidgetKey, ThemeType.dark);
-            }
-            if (scenario.evSourceType == EvSourceType.camera) {
-              await takePhoto(tester, scenarioWidgetKey);
-            } else {
-              await toggleIncidentMetering(tester, scenarioWidgetKey, 7.3);
-            }
-          },
-        );
-      }
-      await tester.pumpDeviceBuilder(builder);
-      await screenMatchesGolden(
-        tester,
-        'metering_screen',
-      );
-    },
-  );
-}
-
-class _MockMeteringFlow extends StatelessWidget {
-  final IAPProductStatus productStatus;
-
-  const _MockMeteringFlow({required this.productStatus});
-
-  @override
-  Widget build(BuildContext context) {
-    return GoldenTestApplicationMock(
-      productStatus: productStatus,
-      child: const MeteringFlow(),
-    );
-  }
-}

test/screens/settings/settings_screen_golden_test.dart

@@ -1,102 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/widgets.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:golden_toolkit/golden_toolkit.dart';
-import 'package:lightmeter/data/models/ev_source_type.dart';
-import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
-import 'package:lightmeter/data/models/theme_type.dart';
-import 'package:lightmeter/data/shared_prefs_service.dart';
-import 'package:lightmeter/providers/user_preferences_provider.dart';
-import 'package:lightmeter/screens/settings/flow_settings.dart';
-import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-import '../../application_mock.dart';
-
-class _SettingsScreenConfig {
-  final IAPProductStatus iapProductStatus;
-
-  _SettingsScreenConfig(this.iapProductStatus);
-
-  @override
-  String toString() {
-    final buffer = StringBuffer();
-    buffer.write(iapProductStatus.toString().split('.')[1]);
-    return buffer.toString();
-  }
-}
-
-final _testScenarios = [IAPProductStatus.purchased, IAPProductStatus.purchasable].map(
-  (iapProductStatus) => _SettingsScreenConfig(iapProductStatus),
-);
-
-void main() {
-  Future<void> setTheme(WidgetTester tester, Key scenarioWidgetKey, ThemeType themeType) async {
-    final flow = find.descendant(
-      of: find.byKey(scenarioWidgetKey),
-      matching: find.byType(SettingsFlow),
-    );
-    final BuildContext context = tester.element(flow);
-    UserPreferencesProvider.of(context).setThemeType(themeType);
-    await tester.pumpAndSettle();
-  }
-
-  setUpAll(() {
-    SharedPreferences.setMockInitialValues({
-      UserPreferencesService.evSourceTypeKey: EvSourceType.camera.index,
-      UserPreferencesService.meteringScreenLayoutKey: json.encode(
-        {
-          MeteringScreenLayoutFeature.equipmentProfiles: true,
-          MeteringScreenLayoutFeature.extremeExposurePairs: true,
-          MeteringScreenLayoutFeature.filmPicker: true,
-        }.toJson(),
-      ),
-    });
-    PackageInfo.setMockInitialValues(
-      appName: 'Lightmeter',
-      packageName: 'com.vodemn.lightmeter',
-      version: '0.18.0',
-      buildNumber: '48',
-      buildSignature: '',
-    );
-  });
-
-  testGoldens(
-    'SettingsScreen golden test',
-    (tester) async {
-      final builder = DeviceBuilder();
-      for (final scenario in _testScenarios) {
-        builder.addScenario(
-          name: scenario.toString(),
-          widget: _MockSettingsFlow(productStatus: scenario.iapProductStatus),
-          onCreate: (scenarioWidgetKey) async {
-            if (scenarioWidgetKey.toString().contains('Dark')) {
-              await setTheme(tester, scenarioWidgetKey, ThemeType.dark);
-            }
-          },
-        );
-      }
-      await tester.pumpDeviceBuilder(builder);
-      await screenMatchesGolden(
-        tester,
-        'settings_screen',
-      );
-    },
-  );
-}
-
-class _MockSettingsFlow extends StatelessWidget {
-  final IAPProductStatus productStatus;
-
-  const _MockSettingsFlow({required this.productStatus});
-
-  @override
-  Widget build(BuildContext context) {
-    return GoldenTestApplicationMock(
-      productStatus: productStatus,
-      child: const SettingsFlow(),
-    );
-  }
-}

update_goldens.sh

@@ -1,6 +0,0 @@
-defaults -currentHost write -g AppleFontSmoothing -int 0
-goldens=$(find ./test -name "*_golden_test.dart" -print)
-for f in $goldens; do
-    flutter test "$f" --dart-define cameraStubImage=assets/camera_stub_image.jpg --update-goldens
-done
-defaults -currentHost write -g AppleFontSmoothing -int 3