Merge branch 'main' of https://github.com/vodemn/m3_lightmeter into feature/ML-141

ML-154 Made errors non-fatal by default (#158 )
* removed unused analytics event & added `logCrash` * added analytics to `RemoteConfigService` * run app with `runZonedGuarded` * added crash logging to `CameraContainerBloc` * log product id for IAP errors * typo * log crashes in `RemoteConfigService` * ignore silent `FlutterError` * fixed `evFromImage` test * fixed `showBuyProDialog` test * log errors in console * depend on iap 0.7.2 * Made errors non-fatal by default
2024-11-21 15:00:40 +00:00 · 2024-02-13 18:21:02 +01:00 · 2024-02-13 18:19:43 +01:00 · 2024-02-13 18:03:59 +01:00 · 2024-02-13 16:58:26 +01:00
3 changed files with 54 additions and 27 deletions
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -399,7 +399,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = "";
@ -414,7 +414,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.vodemn.lightmeter;
 				PRODUCT_NAME = Lightmeter;
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Lightmeter Distribution";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Lightmeter Development";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@ -536,7 +536,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = "";
@ -551,7 +551,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.vodemn.lightmeter;
 				PRODUCT_NAME = Lightmeter;
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Lightmeter Distribution";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Lightmeter Development";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@ -567,7 +567,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = "";
@ -582,7 +582,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.vodemn.lightmeter;
 				PRODUCT_NAME = Lightmeter;
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Lightmeter Distribution";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Lightmeter Development";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
--- a/lib/data/analytics/api/analytics_firebase.dart
+++ b/lib/data/analytics/api/analytics_firebase.dart
@ -36,7 +36,6 @@ class LightmeterAnalyticsFirebase implements ILightmeterAnalyticsApi {
      stackTrace,
      reason: reason,
      information: information,
-      fatal: true,
    );
  }

--- a/lib/screens/metering/components/camera_container/components/camera_preview/components/histogram/widget_histogram.dart
+++ b/lib/screens/metering/components/camera_container/components/camera_preview/components/histogram/widget_histogram.dart
@ -1,6 +1,7 @@
 import 'dart:math';

 import 'package:camera/camera.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:lightmeter/res/dimens.dart';

@ -64,31 +65,58 @@ class _CameraHistogramState extends State<CameraHistogram> {
      histogramG = List.filled(256, 0);
      histogramB = List.filled(256, 0);

-      final int uvRowStride = image.planes[1].bytesPerRow;
-      final int uvPixelStride = image.planes[1].bytesPerPixel!;
-
-      for (int x = 0; x < image.width; x++) {
-        for (int y = 0; y < image.height; y++) {
-          final int uvIndex = uvPixelStride * (x / 2).floor() + uvRowStride * (y / 2).floor();
-          final int index = y * image.width + x;
-
-          final yp = image.planes[0].bytes[index];
-          final up = image.planes[1].bytes[uvIndex];
-          final vp = image.planes[2].bytes[uvIndex];
-
-          final r = yp + vp * 1436 / 1024 - 179;
-          final g = yp - up * 46549 / 131072 + 44 - vp * 93604 / 131072 + 91;
-          final b = yp + up * 1814 / 1024 - 227;
-
-          histogramR[r.round().clamp(0, 255)]++;
-          histogramG[g.round().clamp(0, 255)]++;
-          histogramB[b.round().clamp(0, 255)]++;
-        }
+      switch (defaultTargetPlatform) {
+        case TargetPlatform.android:
+          _yuv420toRgb(image);
+        case TargetPlatform.iOS:
+          _bgra8888toRgb(image);
+        default:
      }

      if (mounted) setState(() {});
    });
  }
+
+  void _yuv420toRgb(CameraImage image) {
+    final int uvRowStride = image.planes[1].bytesPerRow;
+    final int uvPixelStride = image.planes[1].bytesPerPixel!;
+
+    for (int x = 0; x < image.width; x++) {
+      for (int y = 0; y < image.height; y++) {
+        final int uvIndex = uvPixelStride * (x / 2).floor() + uvRowStride * (y / 2).floor();
+        final int index = y * image.width + x;
+
+        final yp = image.planes[0].bytes[index];
+        final up = image.planes[1].bytes[uvIndex];
+        final vp = image.planes[2].bytes[uvIndex];
+
+        final r = yp + vp * 1436 / 1024 - 179;
+        final g = yp - up * 46549 / 131072 + 44 - vp * 93604 / 131072 + 91;
+        final b = yp + up * 1814 / 1024 - 227;
+
+        histogramR[r.round().clamp(0, 255)]++;
+        histogramG[g.round().clamp(0, 255)]++;
+        histogramB[b.round().clamp(0, 255)]++;
+      }
+    }
+  }
+
+  void _bgra8888toRgb(CameraImage image) {
+    for (int i = 0; i < image.planes.first.bytes.length; i++) {
+      final int channel = i % 4;
+      switch (channel) {
+        case 3:
+          break;
+        case 2:
+          histogramR[image.planes.first.bytes[i]]++;
+        case 1:
+          histogramG[image.planes.first.bytes[i]]++;
+        case 0:
+          histogramB[image.planes.first.bytes[i]]++;
+        default:
+      }
+    }
+  }
 }

 class HistogramChannel extends StatelessWidget {
Author	SHA1	Message	Date
Vadim	bc6d01f87c	Merge branch 'main' of https://github.com/vodemn/m3_lightmeter into feature/ML-141	2024-02-13 18:21:02 +01:00
Vadim	4f4b6cf1eb	ML-154 Made errors non-fatal by default (#158 ) * removed unused analytics event & added `logCrash` * added analytics to `RemoteConfigService` * run app with `runZonedGuarded` * added crash logging to `CameraContainerBloc` * log product id for IAP errors * typo * log crashes in `RemoteConfigService` * ignore silent `FlutterError` * fixed `evFromImage` test * fixed `showBuyProDialog` test * log errors in console * depend on iap 0.7.2 * Made errors non-fatal by default	2024-02-13 18:19:43 +01:00
Vadim	ab54de7612	replaced distribution profile with development profile	2024-02-13 18:03:59 +01:00
Vadim	26619ce3de	[iOS] fixed histogram	2024-02-13 16:58:26 +01:00