Merge branch 'master' into rework_interface

jb3rndt · Mar 13, 2024 · 884a11e · 884a11e
2 parents 151540a + 47e46cf
commit 884a11e
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 49 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -0,0 +1,7 @@
+Fixes #
+
+## Proposed Changes
+
+  -
+  -
+  -
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,15 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.2.8] - 2023-03-27
+### Fixed
+- Remove label padding in simple style
+- Check if context is non-null before popping all screens
+
 ## [5.0.0-beta.9] - 2024-03-04
 ## [5.0.0-beta.8] - 2024-01-15
 ### Fixed
@@ -510,6 +516,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Includes platform specific behavior as an option (specify it in the two navigator functions).
 - Based on flutter's Cupertino(iOS) bottom navigation bar.
 
+[4.2.8]: https://github.com/jb3rndt/PersistentBottomNavBarV2/compare/4.2.7...4.2.8
 [5.0.0-beta.9]: https://github.com/jb3rndt/PersistentBottomNavBarV2/compare/5.0.0-beta.8...5.0.0-beta.9
 [5.0.0-beta.8]: https://github.com/jb3rndt/PersistentBottomNavBarV2/compare/5.0.0-beta.7...5.0.0-beta.8
 [5.0.0-beta.7]: https://github.com/jb3rndt/PersistentBottomNavBarV2/compare/5.0.0-beta.6...5.0.0-beta.7

diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
@@ -41,5 +41,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>
diff --git a/example/lib/screens.dart b/example/lib/screens.dart
@@ -36,10 +36,7 @@ class MainScreen extends StatelessWidget {
                     );
                   }
                 },
-                child: const Text(
-                  "Go to Second Screen with Navbar",
-                  style: TextStyle(color: Colors.white),
-                ),
+                child: const Text("Go to Second Screen with Navbar"),
               ),
             ),
             Center(
@@ -57,10 +54,7 @@ class MainScreen extends StatelessWidget {
                     );
                   }
                 },
-                child: const Text(
-                  "Go to Second Screen without Navbar",
-                  style: TextStyle(color: Colors.white),
-                ),
+                child: const Text("Go to Second Screen without Navbar"),
               ),
             ),
             Center(
@@ -75,18 +69,12 @@ class MainScreen extends StatelessWidget {
                         onPressed: () {
                           Navigator.pop(context);
                         },
-                        child: const Text(
-                          "Exit",
-                          style: TextStyle(color: Colors.white),
-                        ),
+                        child: const Text("Exit"),
                       ),
                     ),
                   );
                 },
-                child: const Text(
-                  "Push bottom sheet on TOP of Nav Bar",
-                  style: TextStyle(color: Colors.white),
-                ),
+                child: const Text("Push bottom sheet on TOP of Nav Bar"),
               ),
             ),
             Center(
@@ -101,18 +89,12 @@ class MainScreen extends StatelessWidget {
                         onPressed: () {
                           Navigator.pop(context);
                         },
-                        child: const Text(
-                          "Exit",
-                          style: TextStyle(color: Colors.white),
-                        ),
+                        child: const Text("Exit"),
                       ),
                     ),
                   );
                 },
-                child: const Text(
-                  "Push bottom sheet BEHIND the Nav Bar",
-                  style: TextStyle(color: Colors.white),
-                ),
+                child: const Text("Push bottom sheet BEHIND the Nav Bar"),
               ),
             ),
             Center(
@@ -126,10 +108,7 @@ class MainScreen extends StatelessWidget {
                     ),
                   );
                 },
-                child: const Text(
-                  "Push Dynamic/Modal Screen",
-                  style: TextStyle(color: Colors.white),
-                ),
+                child: const Text("Push Dynamic/Modal Screen"),
               ),
             ),
           ],
@@ -162,10 +141,7 @@ class MainScreen2 extends StatelessWidget {
                     );
                   }
                 },
-                child: const Text(
-                  "Go to Third Screen with Navbar",
-                  style: TextStyle(color: Colors.white),
-                ),
+                child: const Text("Go to Third Screen with Navbar"),
               ),
             ),
             Center(
@@ -177,21 +153,15 @@ class MainScreen2 extends StatelessWidget {
                     pushScreen(context, screen: const MainScreen3());
                   }
                 },
-                child: const Text(
-                  "Go to Second Screen without Navbar",
-                  style: TextStyle(color: Colors.white),
-                ),
+                child: const Text("Go to Second Screen without Navbar"),
               ),
             ),
             Center(
               child: ElevatedButton(
                 onPressed: () {
                   Navigator.pop(context);
                 },
-                child: const Text(
-                  "Go Back to First Screen",
-                  style: TextStyle(color: Colors.white),
-                ),
+                child: const Text("Go Back to First Screen"),
               ),
             ),
           ],
@@ -211,10 +181,7 @@ class MainScreen3 extends StatelessWidget {
             onPressed: () {
               Navigator.pop(context);
             },
-            child: const Text(
-              "Go Back to Second Screen",
-              style: TextStyle(color: Colors.white),
-            ),
+            child: const Text("Go Back to Second Screen"),
           ),
         ),
       );
@@ -246,10 +213,7 @@ class ExampleDialog extends StatelessWidget {
                   onPressed: () {
                     Navigator.pop(context);
                   },
-                  child: const Text(
-                    "Return",
-                    style: TextStyle(color: Colors.white),
-                  ),
+                  child: const Text("Return"),
                 ),
               ),
             ],