Merge 82669bc5e5 into 056cf4f44b

.github/workflows/build_ipa.yml

@@ -60,8 +60,9 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Select Xcode version
-        run: sudo xcode-select -s '/Applications/Xcode_16.2.app/Contents/Developer'
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '16.2'
 
       - name: Connect private iap package
         uses: webfactory/ssh-agent@v0.8.0

.github/workflows/run_integration_tests.yml

@@ -13,11 +13,8 @@ jobs:
   run-integration-tests:
     name: Run integration tests
     timeout-minutes: 90
-    runs-on: macos-14
+    runs-on: macos-13
     steps:
-      - name: Select Xcode version
-        run: sudo xcode-select -s '/Applications/Xcode_16.2.app/Contents/Developer'
-      
       - uses: actions/checkout@v3
         with:
           submodules: recursive

integration_test/purchases_test.dart

@@ -5,12 +5,15 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:lightmeter/data/models/ev_source_type.dart';
 import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
+import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/screens/metering/components/shared/readings_container/components/equipment_profile_picker/widget_picker_equipment_profiles.dart';
 import 'package:lightmeter/screens/metering/components/shared/readings_container/components/extreme_exposure_pairs_container/widget_container_extreme_exposure_pairs.dart';
 import 'package:lightmeter/screens/metering/components/shared/readings_container/components/film_picker/widget_picker_film.dart';
 import 'package:lightmeter/screens/metering/components/shared/readings_container/components/iso_picker/widget_picker_iso.dart';
 import 'package:lightmeter/screens/metering/components/shared/readings_container/components/lightmeter_pro_badge/widget_badge_lightmeter_pro.dart';
 import 'package:lightmeter/screens/metering/components/shared/readings_container/components/nd_picker/widget_picker_nd.dart';
+import 'package:lightmeter/screens/settings/components/shared/disable/widget_disable.dart';
+import 'package:lightmeter/screens/settings/screen_settings.dart';
 import 'package:lightmeter/utils/platform_utils.dart';
 import 'package:meta/meta.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -44,10 +47,19 @@ void testPurchases(String description) {
       /// Expect the bare minimum free functionallity
       _expectProMeteringScreen(enabled: false);
 
+      /// Check, that premium settings are disabled
+      await tester.openSettings();
+      await _expectProSettingsScreen(tester, enabled: false);
+
       /// Make purchase
       (tester.state(find.byType(MockIAPProductsProvider)) as MockIAPProductsProviderState).buy();
       await tester.pumpAndSettle();
 
+      /// Check, that premium settings are enabled
+      await _expectProSettingsScreen(tester, enabled: true);
+
+      /// Expect, that all the premium controls are now available to user
+      await tester.navigatorPop();
       _expectProMeteringScreen(enabled: true);
 
       /// Refund
@@ -56,15 +68,19 @@ void testPurchases(String description) {
 
       /// Expect the bare minimum free functionallity
       _expectProMeteringScreen(enabled: false);
+
+      /// Check, that premium settings are disabled
+      await tester.openSettings();
+      await _expectProSettingsScreen(tester, enabled: false);
     },
   );
 }
 
 void _expectProMeteringScreen({required bool enabled}) {
   expect(find.byType(LightmeterProBadge), !enabled ? findsOneWidget : findsNothing);
-  expect(find.byType(EquipmentProfilePicker), findsOneWidget);
+  expect(find.byType(EquipmentProfilePicker), enabled ? findsOneWidget : findsNothing);
   expect(find.byType(ExtremeExposurePairsContainer), findsOneWidget);
-  expect(find.byType(FilmPicker), findsOneWidget);
+  expect(find.byType(FilmPicker), enabled ? findsOneWidget : findsNothing);
   expect(find.byType(IsoValuePicker), findsOneWidget);
   expect(find.byType(NdValuePicker), findsOneWidget);
   expect(
@@ -72,6 +88,25 @@ void _expectProMeteringScreen({required bool enabled}) {
       of: find.measureButton(),
       matching: find.byWidgetPredicate((widget) => widget is Text && widget.data!.contains('\u2081\u2080\u2080')),
     ),
-    findsOneWidget,
+    enabled ? findsOneWidget : findsNothing,
   );
 }
+
+Future<void> _expectProSettingsScreen(WidgetTester tester, {required bool enabled}) async {
+  void expectDisabled(String title, bool disabled) {
+    find.ancestor(
+      of: find.text(title),
+      matching: find.byWidgetPredicate((widget) => widget is Disable && widget.disable == disabled),
+    );
+  }
+
+  expectDisabled(S.current.showEv100, !enabled);
+  expectDisabled(S.current.equipmentProfiles, !enabled);
+  expectDisabled(S.current.filmsInUse, !enabled);
+  expectDisabled(S.current.cameraFeatures, !enabled);
+  await tester.tapDescendantTextOf<SettingsScreen>(S.current.meteringScreenLayout);
+  expectDisabled(S.current.meteringScreenLayoutHintEquipmentProfiles, !enabled);
+  expectDisabled(S.current.meteringScreenFeatureExtremeExposurePairs, false); // must be always enabled
+  expectDisabled(S.current.meteringScreenFeatureFilmPicker, !enabled);
+  await tester.tapCancelButton();
+}

lib/screens/logbook_photos/screen_logbook_photos.dart

@@ -37,7 +37,7 @@ class _LogbookPhotosScreenState extends State<LogbookPhotosScreen> with SingleTi
                   guardProTap(
                     context,
                     () {
-                      LogbookPhotosProvider.of(context).saveLogbookPhotos(value);
+                      Navigator.of(context).pushNamed(NavigationRoutes.proFeaturesScreen.name);
                     },
                   );
                 },