diff --git a/app_flowy/packages/flowy_infra_ui/example/lib/home/home_screen.dart b/app_flowy/packages/flowy_infra_ui/example/lib/home/home_screen.dart index ca9e17d8c1..a6b4087417 100644 --- a/app_flowy/packages/flowy_infra_ui/example/lib/home/home_screen.dart +++ b/app_flowy/packages/flowy_infra_ui/example/lib/home/home_screen.dart @@ -1,5 +1,5 @@ -import 'package:example/keyboard/keyboard_screen.dart'; import 'package:flutter/material.dart'; +import '../keyboard/keyboard_screen.dart'; import 'demo_item.dart'; class HomeScreen extends StatelessWidget { diff --git a/app_flowy/packages/flowy_infra_ui/example/lib/main.dart b/app_flowy/packages/flowy_infra_ui/example/lib/main.dart index fcaec37764..35d08970a2 100644 --- a/app_flowy/packages/flowy_infra_ui/example/lib/main.dart +++ b/app_flowy/packages/flowy_infra_ui/example/lib/main.dart @@ -1,5 +1,5 @@ -import 'package:example/home/home_screen.dart'; import 'package:flutter/material.dart'; +import '../home/home_screen.dart'; void main() { runApp(const ExampleApp()); diff --git a/app_flowy/packages/flowy_infra_ui/example/test/widget_test.dart b/app_flowy/packages/flowy_infra_ui/example/test/widget_test.dart index 09c1545e57..198cf4618d 100644 --- a/app_flowy/packages/flowy_infra_ui/example/test/widget_test.dart +++ b/app_flowy/packages/flowy_infra_ui/example/test/widget_test.dart @@ -18,8 +18,12 @@ void main() { // Verify that platform version is retrieved. expect( find.byWidgetPredicate( +<<<<<<< HEAD (Widget widget) => widget is Text && widget.data!.startsWith('Running on:'), +======= + (Widget widget) => widget is Text && widget.data!.startsWith('Running on:'), +>>>>>>> [infra_ui][keyboard] Bump infra_ui to 1.20.0 and fix compiling issues ), findsOneWidget, ); diff --git a/app_flowy/packages/flowy_infra_ui/lib/src/overlay/overlay_widget.dart b/app_flowy/packages/flowy_infra_ui/lib/src/overlay/overlay_widget.dart index 543818fc5c..8d7b427e9b 100644 --- a/app_flowy/packages/flowy_infra_ui/lib/src/overlay/overlay_widget.dart +++ b/app_flowy/packages/flowy_infra_ui/lib/src/overlay/overlay_widget.dart @@ -1,7 +1,10 @@ import 'package:flutter/material.dart'; class Overlay extends StatelessWidget { - const Overlay({Key? key}) : super(key: key); + const Overlay({ + Key? key, + this.safeAreaEnabled = true, + }) : super(key: key); final bool safeAreaEnabled;