From 0a16389f43557ae42cfb117f7d0886eb1d6c6577 Mon Sep 17 00:00:00 2001
From: "Jason C.H" <ctrysbita@outlook.com>
Date: Tue, 8 Aug 2023 02:13:17 +0800
Subject: [PATCH 1/3] Fix top padding for NavigationBar

---
 .../lib/src/adaptive_scaffold.dart                | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/flutter_adaptive_scaffold/lib/src/adaptive_scaffold.dart b/packages/flutter_adaptive_scaffold/lib/src/adaptive_scaffold.dart
index 55b77f8152b0..3f2a030436b2 100644
--- a/packages/flutter_adaptive_scaffold/lib/src/adaptive_scaffold.dart
+++ b/packages/flutter_adaptive_scaffold/lib/src/adaptive_scaffold.dart
@@ -328,20 +328,25 @@ class AdaptiveScaffold extends StatefulWidget {
         final NavigationBarThemeData currentNavBarTheme =
             NavigationBarTheme.of(context);
         return NavigationBarTheme(
-            data: currentNavBarTheme.copyWith(
-              iconTheme: MaterialStateProperty.resolveWith(
-                  (Set<MaterialState> states) {
+          data: currentNavBarTheme.copyWith(
+            iconTheme: MaterialStateProperty.resolveWith(
+              (Set<MaterialState> states) {
                 return currentNavBarTheme.iconTheme
                         ?.resolve(states)
                         ?.copyWith(size: iconSize) ??
                     IconTheme.of(context).copyWith(size: iconSize);
-              }),
+              },
             ),
+          ),
+          child: MediaQuery(
+            data: MediaQuery.of(context).removePadding(removeTop: true),
             child: NavigationBar(
               selectedIndex: currentIndex ?? 0,
               destinations: destinations,
               onDestinationSelected: onDestinationSelected,
-            ));
+            ),
+          ),
+        );
       },
     );
   }

From 75258c73f7dab3a32d9445e6e3e935f65064851b Mon Sep 17 00:00:00 2001
From: "Jason C.H" <ctrysbita@outlook.com>
Date: Tue, 8 Aug 2023 02:26:26 +0800
Subject: [PATCH 2/3] Update tests to simulate status bar

---
 packages/flutter_adaptive_scaffold/AUTHORS                   | 3 ++-
 .../flutter_adaptive_scaffold/test/simulated_layout.dart     | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/flutter_adaptive_scaffold/AUTHORS b/packages/flutter_adaptive_scaffold/AUTHORS
index 8c0344813dc1..0bbdf210f3c2 100644
--- a/packages/flutter_adaptive_scaffold/AUTHORS
+++ b/packages/flutter_adaptive_scaffold/AUTHORS
@@ -3,4 +3,5 @@
 #
 #   Name/Organization <email address>
 
-Google Inc.
\ No newline at end of file
+Google Inc.
+Jason C.H <ctrysbita@outlook.com>
\ No newline at end of file
diff --git a/packages/flutter_adaptive_scaffold/test/simulated_layout.dart b/packages/flutter_adaptive_scaffold/test/simulated_layout.dart
index 46a8f8f6e5cc..c0de35d904c9 100644
--- a/packages/flutter_adaptive_scaffold/test/simulated_layout.dart
+++ b/packages/flutter_adaptive_scaffold/test/simulated_layout.dart
@@ -136,7 +136,10 @@ enum SimulatedLayout {
         ),
       ),
       home: MediaQuery(
-        data: MediaQueryData(size: size),
+        data: MediaQueryData(
+          size: size,
+          padding: const EdgeInsets.only(top: 30),
+        ),
         child: TestScaffold(
           initialIndex: initialIndex,
           isAnimated: animations,

From ec5a1ea69d1c12476177b6c6e1cda8eb2f08b0f1 Mon Sep 17 00:00:00 2001
From: "Jason C.H" <ctrysbita@outlook.com>
Date: Tue, 8 Aug 2023 02:32:55 +0800
Subject: [PATCH 3/3] Bump version

---
 packages/flutter_adaptive_scaffold/CHANGELOG.md | 6 +++++-
 packages/flutter_adaptive_scaffold/pubspec.yaml | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/flutter_adaptive_scaffold/CHANGELOG.md b/packages/flutter_adaptive_scaffold/CHANGELOG.md
index e9a4b501f418..0b17c041c435 100644
--- a/packages/flutter_adaptive_scaffold/CHANGELOG.md
+++ b/packages/flutter_adaptive_scaffold/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.7
+
+* Fix top padding for NavigationBar
+
 ## 0.1.6
 
 * Added support for displaying an AppBar on any Breakpoint by introducing appBarBreakpoint
@@ -11,7 +15,7 @@
 ## 0.1.4
 
 * Use Material 3 NavigationBar instead of BottomNavigationBar
- 
+
 ## 0.1.3
 
 * Fixes `groupAlignment` property not available in `standardNavigationRail` - [flutter/flutter#121994](https://github.com/flutter/flutter/issues/121994)
diff --git a/packages/flutter_adaptive_scaffold/pubspec.yaml b/packages/flutter_adaptive_scaffold/pubspec.yaml
index 809150415d70..7c43d142517a 100644
--- a/packages/flutter_adaptive_scaffold/pubspec.yaml
+++ b/packages/flutter_adaptive_scaffold/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_adaptive_scaffold
 description: Widgets to easily build adaptive layouts, including navigation elements.
-version: 0.1.6
+version: 0.1.7
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_adaptive_scaffold%22
 repository: https://github.com/flutter/packages/tree/main/packages/flutter_adaptive_scaffold