Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrated example to nullsafety and fixed height issue in PersistentTa… #271

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

migrated example to nullsafety and fixed height issue in PersistentTa… #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions example/lib/custom-widget-tabs.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import 'main.dart';
import 'screens.dart';

class CustomWidgetExample extends StatefulWidget {
final BuildContext menuScreenContext;
CustomWidgetExample({Key key, this.menuScreenContext}) : super(key: key);
final BuildContext? menuScreenContext;
CustomWidgetExample({Key? key, this.menuScreenContext}) : super(key: key);

@override
_CustomWidgetExampleState createState() => _CustomWidgetExampleState();
}

class _CustomWidgetExampleState extends State<CustomWidgetExample> {
PersistentTabController _controller;
bool _hideNavBar;
PersistentTabController? _controller;
bool? _hideNavBar;

@override
void initState() {
Expand All @@ -30,7 +30,7 @@ class _CustomWidgetExampleState extends State<CustomWidgetExample> {
hideStatus: _hideNavBar,
onScreenHideButtonPressed: () {
setState(() {
_hideNavBar = !_hideNavBar;
_hideNavBar = !_hideNavBar!;
});
},
),
Expand All @@ -39,7 +39,7 @@ class _CustomWidgetExampleState extends State<CustomWidgetExample> {
hideStatus: _hideNavBar,
onScreenHideButtonPressed: () {
setState(() {
_hideNavBar = !_hideNavBar;
_hideNavBar = !_hideNavBar!;
});
},
),
Expand All @@ -48,7 +48,7 @@ class _CustomWidgetExampleState extends State<CustomWidgetExample> {
hideStatus: _hideNavBar,
onScreenHideButtonPressed: () {
setState(() {
_hideNavBar = !_hideNavBar;
_hideNavBar = !_hideNavBar!;
});
},
),
Expand All @@ -57,7 +57,7 @@ class _CustomWidgetExampleState extends State<CustomWidgetExample> {
hideStatus: _hideNavBar,
onScreenHideButtonPressed: () {
setState(() {
_hideNavBar = !_hideNavBar;
_hideNavBar = !_hideNavBar!;
});
},
),
Expand All @@ -66,7 +66,7 @@ class _CustomWidgetExampleState extends State<CustomWidgetExample> {
hideStatus: _hideNavBar,
onScreenHideButtonPressed: () {
setState(() {
_hideNavBar = !_hideNavBar;
_hideNavBar = !_hideNavBar!;
});
},
),
Expand Down Expand Up @@ -127,6 +127,7 @@ class _CustomWidgetExampleState extends State<CustomWidgetExample> {
controller: _controller,
screens: _buildScreens(),
confineInSafeArea: true,
navBarHeight: kBottomNavigationBarHeight,
itemCount: 5,
handleAndroidBackButtonPress: true,
stateManagement: true,
Expand All @@ -140,10 +141,10 @@ class _CustomWidgetExampleState extends State<CustomWidgetExample> {
items: _navBarsItems(),
onItemSelected: (index) {
setState(() {
_controller.index = index; // THIS IS CRITICAL!! Don't miss it!
_controller!.index = index; // THIS IS CRITICAL!! Don't miss it!
});
},
selectedIndex: _controller.index,
selectedIndex: _controller!.index,
),
),
);
Expand Down
38 changes: 19 additions & 19 deletions example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'screens.dart';

void main() => runApp(MyApp());

BuildContext testContext;
BuildContext? testContext;

class MyApp extends StatelessWidget {
@override
Expand All @@ -30,7 +30,7 @@ class MyApp extends StatelessWidget {
}

class MainMenu extends StatefulWidget {
MainMenu({Key key}) : super(key: key);
MainMenu({Key? key}) : super(key: key);

@override
_MainMenuState createState() => _MainMenuState();
Expand Down Expand Up @@ -78,16 +78,16 @@ class _MainMenuState extends State<MainMenu> {
// ----------------------------------------- Provided Style ----------------------------------------- //

class ProvidedStylesExample extends StatefulWidget {
final BuildContext menuScreenContext;
ProvidedStylesExample({Key key, this.menuScreenContext}) : super(key: key);
final BuildContext? menuScreenContext;
ProvidedStylesExample({Key? key, this.menuScreenContext}) : super(key: key);

@override
_ProvidedStylesExampleState createState() => _ProvidedStylesExampleState();
}

class _ProvidedStylesExampleState extends State<ProvidedStylesExample> {
PersistentTabController _controller;
bool _hideNavBar;
PersistentTabController? _controller;
bool? _hideNavBar;

@override
void initState() {
Expand All @@ -103,7 +103,7 @@ class _ProvidedStylesExampleState extends State<ProvidedStylesExample> {
hideStatus: _hideNavBar,
onScreenHideButtonPressed: () {
setState(() {
_hideNavBar = !_hideNavBar;
_hideNavBar = !_hideNavBar!;
});
},
),
Expand All @@ -112,7 +112,7 @@ class _ProvidedStylesExampleState extends State<ProvidedStylesExample> {
hideStatus: _hideNavBar,
onScreenHideButtonPressed: () {
setState(() {
_hideNavBar = !_hideNavBar;
_hideNavBar = !_hideNavBar!;
});
},
),
Expand All @@ -121,7 +121,7 @@ class _ProvidedStylesExampleState extends State<ProvidedStylesExample> {
hideStatus: _hideNavBar,
onScreenHideButtonPressed: () {
setState(() {
_hideNavBar = !_hideNavBar;
_hideNavBar = !_hideNavBar!;
});
},
),
Expand All @@ -130,7 +130,7 @@ class _ProvidedStylesExampleState extends State<ProvidedStylesExample> {
hideStatus: _hideNavBar,
onScreenHideButtonPressed: () {
setState(() {
_hideNavBar = !_hideNavBar;
_hideNavBar = !_hideNavBar!;
});
},
),
Expand All @@ -139,7 +139,7 @@ class _ProvidedStylesExampleState extends State<ProvidedStylesExample> {
hideStatus: _hideNavBar,
onScreenHideButtonPressed: () {
setState(() {
_hideNavBar = !_hideNavBar;
_hideNavBar = !_hideNavBar!;
});
},
),
Expand Down Expand Up @@ -182,7 +182,7 @@ class _ProvidedStylesExampleState extends State<ProvidedStylesExample> {
},
),
onPressed: (context) {
pushDynamicScreen(context,
pushDynamicScreen(context!,
screen: SampleModalScreen(), withNavBar: true);
}),
PersistentBottomNavBarItem(
Expand Down Expand Up @@ -247,7 +247,7 @@ class _ProvidedStylesExampleState extends State<ProvidedStylesExample> {
bottomScreenMargin: 0.0,
onWillPop: (context) async {
await showDialog(
context: context,
context: context!,
useSafeArea: true,
builder: (context) => Container(
height: 50.0,
Expand Down Expand Up @@ -290,14 +290,14 @@ class _ProvidedStylesExampleState extends State<ProvidedStylesExample> {
// ----------------------------------------- Custom Style ----------------------------------------- //

class CustomNavBarWidget extends StatelessWidget {
final int selectedIndex;
final int? selectedIndex;
final List<PersistentBottomNavBarItem> items;
final ValueChanged<int> onItemSelected;
final ValueChanged<int>? onItemSelected;

CustomNavBarWidget({
Key key,
Key? key,
this.selectedIndex,
@required this.items,
required this.items,
this.onItemSelected,
});

Expand Down Expand Up @@ -330,7 +330,7 @@ class CustomNavBarWidget extends StatelessWidget {
type: MaterialType.transparency,
child: FittedBox(
child: Text(
item.title,
item.title!,
style: TextStyle(
color: isSelected
? (item.activeColorSecondary == null
Expand Down Expand Up @@ -361,7 +361,7 @@ class CustomNavBarWidget extends StatelessWidget {
return Flexible(
child: GestureDetector(
onTap: () {
this.onItemSelected(index);
this.onItemSelected!(index);
},
child: _buildItem(item, selectedIndex == index),
),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/modal-screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class SampleModalScreen extends ModalRoute<void> {
Color get barrierColor => Colors.black.withOpacity(0.5);

@override
String get barrierLabel => null;
String? get barrierLabel => null;

@override
bool get maintainState => true;
Expand Down
18 changes: 9 additions & 9 deletions example/lib/screens.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import 'package:persistent_bottom_nav_bar/persistent-tab-view.dart';
import 'modal-screen.dart';

class MainScreen extends StatelessWidget {
final BuildContext menuScreenContext;
final Function onScreenHideButtonPressed;
final bool hideStatus;
final BuildContext? menuScreenContext;
final Function? onScreenHideButtonPressed;
final bool? hideStatus;
const MainScreen(
{Key key,
{Key? key,
this.menuScreenContext,
this.onScreenHideButtonPressed,
this.hideStatus = false})
Expand Down Expand Up @@ -117,10 +117,10 @@ class MainScreen extends StatelessWidget {
Center(
child: ElevatedButton(
onPressed: () {
this.onScreenHideButtonPressed();
this.onScreenHideButtonPressed!();
},
child: Text(
this.hideStatus
this.hideStatus!
? "Unhide Navigation Bar"
: "Hide Navigation Bar",
style: TextStyle(color: Colors.white),
Expand All @@ -130,7 +130,7 @@ class MainScreen extends StatelessWidget {
Center(
child: ElevatedButton(
onPressed: () {
Navigator.of(this.menuScreenContext).pop();
Navigator.of(this.menuScreenContext!).pop();
},
child: Text(
"<- Main Menu",
Expand All @@ -150,7 +150,7 @@ class MainScreen extends StatelessWidget {
}

class MainScreen2 extends StatelessWidget {
const MainScreen2({Key key}) : super(key: key);
const MainScreen2({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
Expand Down Expand Up @@ -188,7 +188,7 @@ class MainScreen2 extends StatelessWidget {
}

class MainScreen3 extends StatelessWidget {
const MainScreen3({Key key}) : super(key: key);
const MainScreen3({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
Expand Down
18 changes: 9 additions & 9 deletions example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.5.0"
version: "2.8.2"
boolean_selector:
dependency: transitive
description:
Expand All @@ -21,14 +21,14 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.2.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.1"
clock:
dependency: transitive
description:
Expand Down Expand Up @@ -66,14 +66,14 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.10"
version: "0.12.11"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.7.0"
path:
dependency: transitive
description:
Expand All @@ -99,7 +99,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -134,7 +134,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.19"
version: "0.4.3"
typed_data:
dependency: transitive
description:
Expand All @@ -148,6 +148,6 @@ packages:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.1"
sdks:
dart: ">=2.12.0 <3.0.0"
dart: ">=2.14.0 <3.0.0"
2 changes: 1 addition & 1 deletion example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: An example project for persistent_bottom_nav_bar
version: 1.0.0

environment:
sdk: ">=2.1.0 <3.0.0"
sdk: '>=2.12.0 <3.0.0'

dependencies:
flutter:
Expand Down