Merge pull request #79 from mclark4386/fixes_for_bottom

lejard-h · web-flow · commit bb198c9c6525 · 2018-05-24T19:54:33.000+02:00
Taking safe areas into account for bottom bars
diff --git a/lib/src/webview_scaffold.dart b/lib/src/webview_scaffold.dart
@@ -98,12 +98,15 @@ class _WebviewScaffoldState extends State<WebviewScaffold> {
 
     if (widget.bottomNavigationBar != null) {
       height -=
-          56.0; // todo(lejard_h) find a way to determine bottomNavigationBar programmatically
+          56.0 + mediaQuery.padding.bottom; // todo(lejard_h) find a way to determine bottomNavigationBar programmatically
     }
 
     if (widget.persistentFooterButtons != null) {
       height -=
           53.0; // todo(lejard_h) find a way to determine persistentFooterButtons programmatically
+      if (widget.bottomNavigationBar == null){
+         height -= mediaQuery.padding.bottom;
+      }
     }
 
     return new Rect.fromLTWH(0.0, top, mediaQuery.size.width, height);

Original file line number	Diff line number	Diff line change
`@@ -98,12 +98,15 @@ class _WebviewScaffoldState extends State<WebviewScaffold> {`
`98`	`98`
`99`	`99`	`if (widget.bottomNavigationBar != null) {`
`100`	`100`	`height -=`
`101`		`- 56.0; // todo(lejard_h) find a way to determine bottomNavigationBar programmatically`
	`101`	`+ 56.0 + mediaQuery.padding.bottom; // todo(lejard_h) find a way to determine bottomNavigationBar programmatically`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`if (widget.persistentFooterButtons != null) {`
`105`	`105`	`height -=`
`106`	`106`	`53.0; // todo(lejard_h) find a way to determine persistentFooterButtons programmatically`
	`107`	`+ if (widget.bottomNavigationBar == null){`
	`108`	`+ height -= mediaQuery.padding.bottom;`
	`109`	`+ }`
`107`	`110`	`}`
`108`	`111`
`109`	`112`	`return new Rect.fromLTWH(0.0, top, mediaQuery.size.width, height);`