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

Fix for RenderFlex Overflow with useMaterial3 and Default Margin/Padding Values #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for RenderFlex Overflow with useMaterial3 and Default Margin/Padding Values #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3092a69
fix: Fixed RenderFlex overflow error when useMaterial3: true by setti…
taiseidev Jan 27, 2024
6c63cbc
fix: Removed unused AnimationController, some refactoring
taiseidev Jan 27, 2024
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
68 changes: 24 additions & 44 deletions example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,63 +27,43 @@ class Home extends StatefulWidget {
_HomeState createState() => _HomeState();
}

class _HomeState extends State<Home> with TickerProviderStateMixin {
class _HomeState extends State<Home> with TickerProviderStateMixin {
var _selectedTab = _SelectedTab.home;

void _handleIndexChanged(int i) {
void _handleIndexChanged(int index) {
setState(() {
_selectedTab = _SelectedTab.values[i];
_selectedTab = _SelectedTab.values[index];
});
}

@override
Widget build(BuildContext context) {
var anim = AnimationController(
vsync: this,
value: 1,
duration: const Duration(milliseconds: 500),
);
return Scaffold(
extendBody: true,
body: Container(
child: Image.asset("lib/img/1.png"),
),
bottomNavigationBar: Padding(
padding: EdgeInsets.only(bottom: 10),
child: DotNavigationBar(
margin: EdgeInsets.only(left: 10, right: 10),
currentIndex: _SelectedTab.values.indexOf(_selectedTab),
dotIndicatorColor: Colors.white,
unselectedItemColor: Colors.grey[300],
splashBorderRadius: 50,
// enableFloatingNavBar: false,
onTap: _handleIndexChanged,
items: [
/// Home
DotNavigationBarItem(
icon: Icon(Icons.home),
selectedColor: Color(0xff73544C),
),

/// Likes
DotNavigationBarItem(
icon: Icon(Icons.favorite),
selectedColor: Color(0xff73544C),
),

/// Search
DotNavigationBarItem(
icon: Icon(Icons.search),
selectedColor: Color(0xff73544C),
),

/// Profile
DotNavigationBarItem(
icon: Icon(Icons.person),
selectedColor: Color(0xff73544C),
),
],
),
bottomNavigationBar: DotNavigationBar(
currentIndex: _SelectedTab.values.indexOf(_selectedTab),
dotIndicatorColor: Color(0xff73544C),
selectedItemColor: Color(0xff73544C),
unselectedItemColor: Colors.grey[300],
splashBorderRadius: 50,
onTap: _handleIndexChanged,
items: [
DotNavigationBarItem(
icon: Icon(Icons.home),
),
DotNavigationBarItem(
icon: Icon(Icons.favorite),
),
DotNavigationBarItem(
icon: Icon(Icons.search),
),
DotNavigationBarItem(
icon: Icon(Icons.person),
),
],
),
);
}
Expand Down
66 changes: 31 additions & 35 deletions lib/src/NavBars.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ class DotNavigationBar extends StatelessWidget {
this.selectedItemColor,
this.unselectedItemColor,
this.margin = const EdgeInsets.all(8),
this.itemPadding = const EdgeInsets.symmetric(vertical: 10, horizontal: 16),
this.itemPadding = const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
this.duration = const Duration(milliseconds: 500),
this.curve = Curves.easeOutQuint,
this.dotIndicatorColor,
this.marginR = const EdgeInsets.symmetric(horizontal: 50, vertical: 20),
this.paddingR = const EdgeInsets.only(bottom: 5, top: 10),
this.marginR,
this.paddingR,
this.borderRadius = 30,
this.splashBorderRadius,
this.backgroundColor = Colors.white,
Expand Down Expand Up @@ -98,43 +98,39 @@ class DotNavigationBar extends StatelessWidget {
? BottomAppBar(
color: Colors.transparent,
elevation: 0,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Padding(
padding: marginR!,
child: Container(
padding: paddingR,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(borderRadius!),
color: backgroundColor,
boxShadow: boxShadow,
),
width: double.infinity,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8),
child: Body(
items: items,
currentIndex: currentIndex,
curve: curve,
duration: duration,
selectedItemColor: selectedItemColor,
theme: theme,
unselectedItemColor: unselectedItemColor,
onTap: onTap!,
itemPadding: itemPadding,
dotIndicatorColor: dotIndicatorColor,
enablePaddingAnimation: enablePaddingAnimation,
splashColor: splashColor,
splashBorderRadius: splashBorderRadius),
),
child: Padding(
padding: marginR ?? EdgeInsets.zero,
child: Container(
padding: paddingR ?? EdgeInsets.zero,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(borderRadius!),
color: backgroundColor,
boxShadow: boxShadow,
),
width: double.infinity,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8),
child: Body(
items: items,
currentIndex: currentIndex,
curve: curve,
duration: duration,
selectedItemColor: selectedItemColor,
theme: theme,
unselectedItemColor: unselectedItemColor,
onTap: onTap!,
itemPadding: itemPadding,
dotIndicatorColor: dotIndicatorColor,
enablePaddingAnimation: enablePaddingAnimation,
splashColor: splashColor,
splashBorderRadius: splashBorderRadius,
),
),
],
),
),
)
: Container(
padding: EdgeInsets.symmetric(vertical: 12),
padding: EdgeInsets.symmetric(vertical: 16),
color: backgroundColor,
child: Padding(
padding: margin,
Expand Down