Add screenshot to SentryFeedbackWidget

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ## Unreleased
 
+### Features
+
+- Add screenshot to `SentryFeedbackWidget` ([#2369](https://github.com/getsentry/sentry-dart/pull/2369))
+  - Use `SentryFlutter.captureScreenshot` to create a screenshot attachment
+  - Call `SentryFeedbackWidget` with this attachment to add it to the user feedback
+
+  ```dart
+  final id = await Sentry.captureMessage('UserFeedback');
+  final screenshot = await SentryFlutter.captureScreenshot();
+
+  Navigator.push(
+    context,
+    MaterialPageRoute(
+      builder: (context) => SentryFeedbackWidget(
+          associatedEventId: id,
+          screenshot: screenshot,
+      ),
+      fullscreenDialog: true,
+    ),
+  );
+  ```
+
 ### Enhancements
 
 - Cache parsed DSN ([#2365](https://github.com/getsentry/sentry-dart/pull/2365))

flutter/example/lib/main.dart

@@ -502,12 +502,14 @@ class MainScaffold extends StatelessWidget {
             TooltipButton(
               onPressed: () async {
                 final id = await Sentry.captureMessage('UserFeedback');
+                final screenshot = await SentryFlutter.captureScreenshot();
+
                 if (!context.mounted) return;
                 Navigator.push(
                   context,
                   MaterialPageRoute(
-                    builder: (context) =>
-                        SentryFeedbackWidget(associatedEventId: id),
+                    builder: (context) => SentryFeedbackWidget(
+                        associatedEventId: id, screenshot: screenshot),
                     fullscreenDialog: true,
                   ),
                 );

flutter/lib/src/event_processor/screenshot_event_processor.dart

@@ -3,10 +3,11 @@ import 'dart:math';
 import 'dart:typed_data';
 import 'dart:ui';
 
+import 'package:flutter/rendering.dart';
+import 'package:meta/meta.dart';
 import 'package:sentry/sentry.dart';
 import '../screenshot/sentry_screenshot_widget.dart';
 import '../sentry_flutter_options.dart';
-import 'package:flutter/rendering.dart';
 import '../renderer/renderer.dart';
 import 'package:flutter/widgets.dart' as widget;
 
@@ -15,10 +16,6 @@ class ScreenshotEventProcessor implements EventProcessor {
 
   ScreenshotEventProcessor(this._options);
 
-  /// This is true when the SentryWidget is in the view hierarchy
-  bool get _hasSentryScreenshotWidget =>
-      sentryScreenshotWidgetGlobalKey.currentContext != null;
-
   @override
   Future<SentryEvent?> apply(SentryEvent event, Hint hint) async {
     if (event is SentryTransaction) {
@@ -27,9 +24,14 @@ class ScreenshotEventProcessor implements EventProcessor {
 
     if (event.exceptions == null &&
         event.throwable == null &&
-        _hasSentryScreenshotWidget) {
+        SentryScreenshotWidget.isMounted) {
       return event;
     }
+
+    if (event.type == 'feedback') {
+      return event; // No need to attach screenshot of feedback form.
+    }
+
     final beforeScreenshot = _options.beforeScreenshot;
     if (beforeScreenshot != null) {
       try {
@@ -75,14 +77,15 @@ class ScreenshotEventProcessor implements EventProcessor {
       return event;
     }
 
-    final bytes = await _createScreenshot();
+    final bytes = await createScreenshot();
     if (bytes != null) {
       hint.screenshot = SentryAttachment.fromScreenshotData(bytes);
     }
     return event;
   }
 
-  Future<Uint8List?> _createScreenshot() async {
+  @internal
+  Future<Uint8List?> createScreenshot() async {
     try {
       final renderObject =
           sentryScreenshotWidgetGlobalKey.currentContext?.findRenderObject();

flutter/lib/src/feedback/sentry_feedback_widget.dart

@@ -21,6 +21,7 @@ class SentryFeedbackWidget extends StatefulWidget {
     this.isRequiredLabel = '(required)',
     this.isNameRequired = false,
     this.isEmailRequired = false,
+    this.screenshot,
   })  : assert(associatedEventId != const SentryId.empty()),
         _hub = hub ?? HubAdapter();
 
@@ -45,6 +46,8 @@ class SentryFeedbackWidget extends StatefulWidget {
   final bool isNameRequired;
   final bool isEmailRequired;
 
+  final SentryAttachment? screenshot;
+
   @override
   _SentryFeedbackWidgetState createState() => _SentryFeedbackWidgetState();
 }
@@ -197,7 +200,12 @@ class _SentryFeedbackWidgetState extends State<SentryFeedbackWidget> {
                         name: _nameController.text,
                         associatedEventId: widget.associatedEventId,
                       );
-                      await _captureFeedback(feedback);
+                      Hint? hint;
+                      final screenshot = widget.screenshot;
+                      if (screenshot != null) {
+                        hint = Hint.withScreenshot(screenshot);
+                      }
+                      await _captureFeedback(feedback, hint);
 
                       bool mounted;
                       try {
@@ -246,7 +254,7 @@ class _SentryFeedbackWidgetState extends State<SentryFeedbackWidget> {
     return null;
   }
 
-  Future<SentryId> _captureFeedback(SentryFeedback feedback) {
-    return widget._hub.captureFeedback(feedback);
+  Future<SentryId> _captureFeedback(SentryFeedback feedback, Hint? hint) {
+    return widget._hub.captureFeedback(feedback, hint: hint);
   }
 }

flutter/lib/src/screenshot/sentry_screenshot_widget.dart

@@ -28,6 +28,10 @@ class SentryScreenshotWidget extends StatefulWidget {
 
   @override
   _SentryScreenshotWidgetState createState() => _SentryScreenshotWidgetState();
+
+  /// This is true when the [SentryScreenshotWidget] is in the widget tree.
+  static bool get isMounted =>
+      sentryScreenshotWidgetGlobalKey.currentContext != null;
 }
 
 class _SentryScreenshotWidgetState extends State<SentryScreenshotWidget> {

flutter/lib/src/sentry_flutter.dart

@@ -9,6 +9,7 @@
 import 'event_processor/flutter_enricher_event_processor.dart';
 import 'event_processor/flutter_exception_event_processor.dart';
 import 'event_processor/platform_exception_event_processor.dart';
+import 'event_processor/screenshot_event_processor.dart';
 import 'event_processor/url_filter/url_filter_event_processor.dart';
 import 'event_processor/widget_event_processor.dart';
 import 'file_system_transport.dart';
@@ -284,6 +285,36 @@
     }
   }
 
+  /// Uses [SentryScreenshotWidget] to capture the current screen as a
+  /// [SentryAttachment].
+  static Future<SentryAttachment?> captureScreenshot() async {
+    // ignore: invalid_use_of_internal_member
+    final options = Sentry.currentHub.options;
+    if (!SentryScreenshotWidget.isMounted) {
+      options.logger(
+        SentryLevel.debug,
+        'SentryScreenshotWidget could not be found in the widget tree.',
+      );
+      return null;
+    }
+    final processors =
+        options.eventProcessors.whereType<ScreenshotEventProcessor>();
+    if (processors.isEmpty) {
+      options.logger(
+        SentryLevel.debug,
+        'ScreenshotEventProcessor could not be found.',
+      );
+      return null;
+    }
+    final processor = processors.first;
+    final bytes = await processor.createScreenshot();
+    if (bytes != null) {
+      return SentryAttachment.fromScreenshotData(bytes);
+    } else {
+      return null;
+    }
+  }
+
   @internal
   static SentryNativeBinding? get native => _native;
 

flutter/test/event_processor/screenshot_event_processor_test.dart

@@ -96,6 +96,36 @@ void main() {
         added: true, isWeb: false, expectedMaxWidthOrHeight: widthOrHeight);
   });
 
+  testWidgets('does not add screenshot for feedback events', (tester) async {
+    await tester.runAsync(() async {
+      final sut = fixture.getSut(null, false);
+
+      await tester.pumpWidget(
+        SentryScreenshotWidget(
+          child: Text('Catching Pokémon is a snap!',
+              textDirection: TextDirection.ltr),
+        ),
+      );
+
+      final feedback = SentryFeedback(
+        message: 'message',
+        contactEmail: '[email protected]',
+        name: 'Joe Dirt',
+        associatedEventId: null,
+      );
+      final feedbackEvent = SentryEvent(
+        type: 'feedback',
+        contexts: Contexts(feedback: feedback),
+        level: SentryLevel.info,
+      );
+
+      final hint = Hint();
+      await sut.apply(feedbackEvent, hint);
+
+      expect(hint.screenshot, isNull);
+    });
+  });
+
   group('beforeScreenshot', () {
     testWidgets('does add screenshot if beforeScreenshot returns true',
         (tester) async {

flutter/test/feedback/sentry_feedback_widget_test.dart

@@ -104,6 +104,44 @@ void main() {
       fixture = Fixture();
     });
 
+    testWidgets('does add screenshot attachment to hint', (tester) async {
+      final screenshot = SentryAttachment.fromIntList([0, 0, 0, 0], 'test.png');
+
+      await fixture.pumpFeedbackWidget(
+        tester,
+        (hub) => SentryFeedbackWidget(
+          hub: hub,
+          screenshot: screenshot,
+        ),
+      );
+
+      when(fixture.hub.captureFeedback(
+        any,
+        hint: anyNamed('hint'),
+        withScope: anyNamed('withScope'),
+      )).thenAnswer(
+          (_) async => SentryId.fromId('1988bb1b6f0d4c509e232f0cb9aaeaea'));
+
+      await tester.enterText(
+          find.byKey(ValueKey('sentry_feedback_name_textfield')),
+          "fixture-name");
+      await tester.enterText(
+          find.byKey(ValueKey('sentry_feedback_email_textfield')),
+          "fixture-email");
+      await tester.enterText(
+          find.byKey(ValueKey('sentry_feedback_message_textfield')),
+          "fixture-message");
+      await tester.tap(find.text('Send Bug Report'));
+      await tester.pumpAndSettle();
+
+      verify(fixture.hub.captureFeedback(
+        any,
+        hint: argThat(predicate<Hint>((hint) => hint.screenshot == screenshot),
+            named: 'hint'),
+        withScope: anyNamed('withScope'),
+      )).called(1);
+    });
+
     testWidgets('does call hub captureFeedback on submit', (tester) async {
       await fixture.pumpFeedbackWidget(
         tester,

min_version_test/lib/main.dart

@@ -144,7 +144,7 @@ class _MyHomePageState extends State<MyHomePage> {
             Text(
               '$_counter',
               // ignore: deprecated_member_use
-              style: Theme.of(context).textTheme.headline4,
+              style: Theme.of(context).textTheme.headlineMedium,
             ),
           ],
         ),