[iOS] separated camera handling logic

.github/workflows/build_apk.yml

@@ -3,19 +3,29 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Build Prod .ipa
+name: Build .apk
 
 on:
   workflow_dispatch:
-
+    inputs:
-env:
+      flavor:
-  FLAVOR: "prod"
+        description: 'Flavor'   
+        type: choice  
+        required: true
+        options:
+          - dev
+          - prod
+        default: 'dev'
+      include-iap:
+        type: boolean
+        description: Include IAP package
+        default: true
 
 jobs:
   build:
-    name: Build .ipa
+    name: Build .apk
     runs-on: macos-11
-    timeout-minutes: 20
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v3
         with:
@@ -23,54 +33,52 @@ jobs:
 
       - name: Connect private iap package
         uses: webfactory/ssh-agent@v0.8.0
+        if: ${{ inputs.include-iap }}
         with:
           ssh-private-key: ${{ secrets.M3_LIGHTMETER_IAP_KEY }}
 
+      - name: Override iap package with stub
+        if: ${{ !inputs.include-iap }}
+        run: bash ./.github/scripts/stub_iap.sh
+        
       - uses: actions/setup-java@v2
         with:
           distribution: "zulu"
           java-version: "11"
 
-      - name: Install the Apple certificate and provisioning profile
+      - name: Restore Android keystore .jsk and .properties files
         env:
-          APP_STORE_P12: ${{ secrets.APP_STORE_P12 }}
+          KEYSTORE: ${{ secrets.KEYSTORE }}
-          APP_STORE_P12_PASSWORD: ${{ secrets.APP_STORE_P12_PASSWORD }}
+          KEYSTORE_PROPERTIES: ${{ secrets.KEYSTORE_PROPERTIES }}
-          APP_STORE_PROVISION_PROD: ${{ secrets.APP_STORE_PROVISION_PROD }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
         run: |
-          # create variables
+          KEYSTORE_PATH=$RUNNER_TEMP/keystore.jks
-          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          echo -n "$KEYSTORE" | base64 --decode --output $KEYSTORE_PATH
-          PROVISION_PATH=$RUNNER_TEMP/build_provision.mobileprovision
+          cp $KEYSTORE_PATH ./android/app
-          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+          KEYSTORE_PROPERTIES_PATH=$RUNNER_TEMP/key.properties
+          echo -n "$KEYSTORE_PROPERTIES" | base64 --decode --output $KEYSTORE_PROPERTIES_PATH
+          cp $KEYSTORE_PROPERTIES_PATH ./android
 
-          # import certificate and provisioning profile from secrets
+      - name: Restore android/app/google-services.json
-          echo -n "$APP_STORE_P12" | base64 --decode -o $CERTIFICATE_PATH
+        env:
-          echo -n "$APP_STORE_PROVISION_PROD" | base64 --decode -o $PROVISION_PATH
+          GOOGLE_SERVICES_JSON_ANDROID: ${{ secrets.GOOGLE_SERVICES_JSON_ANDROID }}
-
+        run: |
-          # create temporary keychain
+          GOOGLE_SERVICES_JSON_ANDROID_PATH=$RUNNER_TEMP/google-services.json
-          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          echo -n "$GOOGLE_SERVICES_JSON_ANDROID" | base64 --decode --output $GOOGLE_SERVICES_JSON_ANDROID_PATH
-          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          cp $GOOGLE_SERVICES_JSON_ANDROID_PATH ./android/app
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-
-          # import certificate to keychain
-          security import $CERTIFICATE_PATH -P "$APP_STORE_P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
-          security list-keychain -d user -s $KEYCHAIN_PATH
-
-          # apply provisioning profile
-          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
-          cp $PROVISION_PATH ~/Library/MobileDevice/Provisioning\ Profiles
-
-      - name: Restore ios/Runner/ExportOptions.plist
-        run: bash .github/scripts/restore_from_base64.sh "${{ secrets.APP_STORE_EXPORT_OPTIONS }}" "ios/Runner/ExportOptions.plist"
 
       - name: Restore firebase_options.dart
-        run: bash .github/scripts/restore_from_base64.sh "${{ secrets.FIREBASE_OPTIONS }}" "lib/firebase_options.dart"
+        env:
+          FIREBASE_OPTIONS: ${{ secrets.FIREBASE_OPTIONS }}
+        run: |
+          FIREBASE_OPTIONS_PATH=$RUNNER_TEMP/firebase_options.dart
+          echo -n "$FIREBASE_OPTIONS" | base64 --decode --output $FIREBASE_OPTIONS_PATH
+          cp $FIREBASE_OPTIONS_PATH ./lib
 
       - name: Install Flutter
         uses: subosito/flutter-action@v2
         with:
           channel: "stable"
-          flutter-version: "3.10.0"
+          flutter-version: '3.10.0'
 
       - name: Prepare flutter project
         run: | 
@@ -78,22 +86,13 @@ jobs:
           flutter pub get
           flutter pub run intl_utils:generate
 
-      - name: Build .ipa
+      - name: Build .apk
-        run: |
+        env:
-          flutter build ipa \
+          FLAVOR: ${{ github.event.inputs.flavor }}
-            --release \
+        run: flutter build apk --release --flavor $FLAVOR -t lib/main_$FLAVOR.dart
-            --flavor $FLAVOR \
-            --target lib/main_$FLAVOR.dart \
-            --export-options-plist=ios/Runner/ExportOptions.plist
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: m3_lightmeter_$FLAVOR_ipa
+          name: m3_lightmeter_${{ github.event.inputs.flavor }}_apk
-          path: build/ios/ipa/lightmeter.ipa
+          path: build/app/outputs/flutter-apk/app-${{ github.event.inputs.flavor }}-release.apk
-      
-      - name: Clean up keychain and provisioning profile
-        if: ${{ always() }}
-        run: |
-          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
-          rm ~/Library/MobileDevice/Provisioning\ Profiles/build_provision.mobileprovision

.github/workflows/build_ipa.yml

@@ -15,7 +15,7 @@ jobs:
   build:
     name: Build .ipa
     runs-on: macos-11
-    timeout-minutes: 20
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
         with:

README.md

@@ -75,17 +75,8 @@ Out of the box Firebase Crashlytics won't work. If you want to add Crashlytics t
 
 ### 4. Build
 
-#### Android
+- Checkout [Build .apk](.github/workflows/build_apk.yml) workflow for Android
-
+- Checkout [Build .ipa](.github/workflows/build_ipa.yml) workflow for iOS
-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
-```
-
-### iOS
-
-TBD
 
 # Support
 

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

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'dart:math' as math;
 
 import 'package:camera/camera.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -253,12 +254,29 @@ class _WidgetsBindingObserver with WidgetsBindingObserver {
 
   _WidgetsBindingObserver(this.onLifecycleStateChanged);
 
+  /// Revoking camera permissions results in app being killed both on Android and iOS
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
+    switch (defaultTargetPlatform) {
+      /// On Android opening a dialog results in [AppLifecycleState.inactive]
+      case TargetPlatform.android:
         if (_prevState == AppLifecycleState.inactive && state == AppLifecycleState.resumed) {
           return;
         }
         _prevState = state;
         onLifecycleStateChanged(state);
+
+      /// When coming from the app's settings iOS fires paused -> inactive -> resumed state which falls into this condition.
+      /// So the inactive state is skipped.
+      case TargetPlatform.iOS:
+        if (state == AppLifecycleState.inactive) {
+          return;
+        }
+        if (_prevState != state) {
+          _prevState = state;
+          onLifecycleStateChanged(state);
+        }
+      default:
+    }
   }
 }

screenshots/scripts/generate_ios_screenshots.sh

@@ -7,7 +7,7 @@ for i in "${devices_array[@]}"; do # https://www.baeldung.com/linux/shell-script
     xcrun simctl boot "$i"
     #uid=$(echo "$(fvm flutter devices)" | sed -n -r "s/$i \(mobile\) • (.*) • .* • .*\(simulator\)/\1/p")
     #echo $uid
-    sh screenshots/generate_screenshots.sh "$i"
+    sh screenshots/scripts/generate_screenshots.sh "$i"
 done
 
 killall 'Simulator'