.github/workflows/build_apk.yml

@@ -16,28 +16,18 @@ on:
           - dev
           - prod
         default: 'dev'
-      include-iap:
-        type: boolean
-        description: Include IAP package
-        default: false # TODO(@vodemn) when Google fixes their api
 
 jobs:
   build:
     name: Build .apk
     runs-on: macos-11
     timeout-minutes: 15
+
     steps:
-      - name: Connect private iap package
-        uses: webfactory/ssh-agent@v0.8.0
-        if: ${{ inputs.include-iap }}
+      - uses: webfactory/ssh-agent@v0.8.0
         with:
           ssh-private-key: ${{ secrets.M3_LIGHTMETER_IAP_KEY }}
            
-      - name: Override iap package with stub
-        if: ${{ !inputs.include-iap }}
-        run: | 
-          echo "\ndependecies_override:\n  m3_lightmeter_iap:\n    path: iap" >> pubspec.yaml
-           
       - uses: actions/checkout@v3
         with:
           submodules: recursive

.github/workflows/create_release.yml

@@ -31,10 +31,6 @@ on:
         type: boolean
         description: Create Google Play release
         default: true
-      include-iap:
-        type: boolean
-        description: Include IAP package
-        default: false # TODO(@vodemn) when Google fixes their api
 
 env:
   BUILD_ARGS: --release --flavor prod --dart-define cameraPreviewAspectRatio=240/320 -t lib/main_prod.dart
@@ -42,21 +38,14 @@ env:
 jobs:
   build:
     name: Build .apk & .aab
-    if: ${{ inputs.github-release || inputs.google-play-release }}
+    if: ${{ inputs.github-release }} || ${{ inputs.google-play-release }}
     runs-on: macos-11
     timeout-minutes: 30
     steps:
-      - name: Connect private iap package
-        uses: webfactory/ssh-agent@v0.8.0
-        if: ${{ inputs.include-iap }}
+      - uses: webfactory/ssh-agent@v0.8.0
         with:
           ssh-private-key: ${{ secrets.M3_LIGHTMETER_IAP_KEY }}
 
-      - name: Override iap package with stub
-        if: ${{ !inputs.include-iap }}
-        run: | 
-          echo "\ndependecies_override:\n  m3_lightmeter_iap:\n    path: iap" >> pubspec.yaml
-
       - uses: actions/checkout@v3
         with:
           submodules: recursive

.github/workflows/pr_check.yml

@@ -11,26 +11,19 @@ on:
   pull_request:
     branches: ["main"]
 
-env:
-  # Stub iap package if this worlflow is running from the PR from a fork
-  STUB_IAP: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
-
 jobs:
   analyze_and_test:
     name: Analyze & test
     runs-on: macos-11
     timeout-minutes: 10
-    steps:
-      - name: Connect private iap package
-        uses: webfactory/ssh-agent@v0.8.0
-        if: !env.STUB_IAP
-        with:
-          ssh-private-key: ${{ secrets.M3_LIGHTMETER_IAP_KEY }}
 
-      - name: Override iap package with stub
-        if: env.STUB_IAP
-        run: |
-          echo "\ndependecies_override:\n  m3_lightmeter_iap:\n    path: iap" >> pubspec.yaml
+    steps:
+      - uses: shaunco/ssh-agent@git-repo-mapping
+        with:
+          ssh-private-key: |
+            ${{ secrets.M3_LIGHTMETER_IAP_KEY }}
+          repo-mappings: |
+            github.com/vodemn/m3_lightmeter_iap
             
       - uses: actions/checkout@v3
         with:
@@ -39,7 +32,7 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: "stable"
-          flutter-version: "3.10.0"
+          flutter-version: '3.10.0'
 
       - name: Prepare flutter project
         run: |

lib/screens/metering/components/camera_container/widget_container_camera.dart

@@ -135,7 +135,7 @@ class CameraContainer extends StatelessWidget {
   }
 
   double _cameraPreviewHeight(BuildContext context) {
-    return ((MediaQuery.sizeOf(context).width - Dimens.grid8 - 2 * Dimens.paddingM) / 2) /
+    return ((MediaQuery.of(context).size.width - Dimens.grid8 - 2 * Dimens.paddingM) / 2) /
         PlatformConfig.cameraPreviewAspectRatio;
   }
 }

lib/screens/metering/components/shared/readings_container/widget_container_readings.dart

@@ -39,7 +39,7 @@ class ReadingsContainer extends StatelessWidget {
       children: [
         if (UserPreferencesProvider.meteringScreenFeatureOf(
           context,
-          MeteringScreenLayoutFeature.equipmentProfiles,
+          MeteringScreenLayoutFeature.extremeExposurePairs,
         )) ...[
           const _EquipmentProfilePicker(),
           const _InnerPadding(),

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

@@ -36,7 +36,6 @@ class _MeteringScreenLayoutFeaturesDialogState extends State<MeteringScreenLayou
             _featureListTile(MeteringScreenLayoutFeature.equipmentProfiles),
             _featureListTile(MeteringScreenLayoutFeature.extremeExposurePairs),
             _featureListTile(MeteringScreenLayoutFeature.filmPicker),
-            _featureListTile(MeteringScreenLayoutFeature.histogram),
           ],
         ),
       ),

pubspec.yaml

@@ -57,7 +57,3 @@ flutter:
 
 flutter_intl:
   enabled: true
-
-dependecies_override:
-  m3_lightmeter_iap:
-    path: iap