Skip to content

Commit ab3bb29

Browse files
chore: rebase dev branch and resolve conflict
1 parent f725976 commit ab3bb29

File tree

2 files changed

+26
-28
lines changed

2 files changed

+26
-28
lines changed

example/lib/main.dart

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,53 @@
11
import 'dart:async';
2+
import 'dart:convert';
23
import 'dart:developer';
34
import 'dart:io';
4-
import 'dart:convert';
55

66
import 'package:flutter/material.dart';
77
import 'package:instabug_flutter/instabug_flutter.dart';
8-
import 'package:instabug_flutter_example/src/components/apm_switch.dart';
9-
import 'package:instabug_http_client/instabug_http_client.dart';
8+
import 'package:instabug_flutter/src/utils/screen_loading/screen_loading_manager.dart';
109
import 'package:instabug_flutter_example/src/app_routes.dart';
10+
import 'package:instabug_flutter_example/src/utils/show_messages.dart';
1111
import 'package:instabug_flutter_example/src/widget/nested_view.dart';
12+
import 'package:instabug_http_client/instabug_http_client.dart';
1213

1314
import 'src/native/instabug_flutter_example_method_channel.dart';
1415
import 'src/widget/instabug_button.dart';
1516
import 'src/widget/instabug_clipboard_input.dart';
1617
import 'src/widget/instabug_text_field.dart';
17-
import 'package:instabug_flutter/src/utils/screen_loading/screen_loading_manager.dart';
18-
1918
import 'src/widget/section_title.dart';
2019

21-
part 'src/screens/crashes_page.dart';
22-
23-
part 'src/screens/complex_page.dart';
24-
25-
part 'src/screens/apm_page.dart';
26-
27-
part 'src/screens/screen_capture_premature_extension_page.dart';
28-
29-
part 'src/screens/screen_loading_page.dart';
30-
31-
part 'src/screens/my_home_page.dart';
32-
20+
part 'src/components/animated_box.dart';
21+
part 'src/components/apm_switch.dart';
3322
part 'src/components/fatal_crashes_content.dart';
34-
35-
part 'src/components/non_fatal_crashes_content.dart';
36-
23+
part 'src/components/flows_content.dart';
3724
part 'src/components/network_content.dart';
38-
25+
part 'src/components/non_fatal_crashes_content.dart';
3926
part 'src/components/page.dart';
40-
41-
part 'src/components/flows_content.dart';
27+
part 'src/components/screen_render.dart';
28+
part 'src/components/screen_render_switch.dart';
29+
part 'src/components/ui_traces_content.dart';
30+
part 'src/screens/apm_page.dart';
31+
part 'src/screens/complex_page.dart';
32+
part 'src/screens/crashes_page.dart';
33+
part 'src/screens/my_home_page.dart';
34+
part 'src/screens/screen_capture_premature_extension_page.dart';
35+
part 'src/screens/screen_loading_page.dart';
36+
part 'src/screens/screen_render_page.dart';
4237

4338
void main() {
4439
runZonedGuarded(
4540
() {
4641
WidgetsFlutterBinding.ensureInitialized();
4742

4843
Instabug.init(
49-
token: 'ed6f659591566da19b67857e1b9d40ab',
50-
invocationEvents: [InvocationEvent.floatingButton],
51-
debugLogsLevel: LogLevel.verbose,
52-
appVariant: 'variant 1');
44+
token: 'ed6f659591566da19b67857e1b9d40ab',
45+
invocationEvents: [InvocationEvent.floatingButton],
46+
debugLogsLevel: LogLevel.verbose,
47+
appVariant: 'variant 1',
48+
).then((_) {
49+
APM.setScreenRenderingEnabled(true);
50+
});
5351

5452
FlutterError.onError = (FlutterErrorDetails details) {
5553
Zone.current.handleUncaughtError(details.exception, details.stack!);

test/instabug_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void main() {
8585
);
8686

8787
//disable the feature flag for screen render feature in order to skip its checking.
88-
when(mApmHost.isScreenRenderingEnabled()).thenAnswer((_) async => false);
88+
when(mApmHost.isScreenRenderEnabled()).thenAnswer((_) async => false);
8989

9090
await Instabug.init(
9191
token: token,

0 commit comments

Comments
 (0)