fix bottom nav bar ui

merge-update-with-lab-changes
hussam al-habibeh 4 years ago
parent cfe9e35c38
commit 7427cd68ff

@ -44,17 +44,17 @@ class _BottomNavPharmacyBarState extends State<BottomNavPharmacyBar> {
title: TranslationBase.of(context).Alhabibapp,
),
Container(
height: 65.0,
child: Center(
child: VerticalDivider(
color: Colors.grey,
thickness: 0.5,
width: 0.3,
indent: 25.5,
),
),
),
// Container(
// height: 65.0,
// child: Center(
// child: VerticalDivider(
// color: Colors.grey,
// thickness: 0.5,
// width: 0.3,
// indent: 25.5,
// ),
// ),
// ),
BottomNavPharmacyItem(
icon: EvaIcons.list,
@ -79,12 +79,13 @@ class _BottomNavPharmacyBarState extends State<BottomNavPharmacyBar> {
// Added Calendar Icon to access book appointment flow
BottomNavPharmacyItem(
icon: EvaIcons.heart,
activeIcon: EvaIcons.heart,
icon: EvaIcons.home,
activeIcon: EvaIcons.home,
changeIndex: _changeIndex,
index: widget.index,
currentIndex: 2,
title: TranslationBase.of(context).wishList),
currentIndex: 0,
isHome: true,
title: TranslationBase.of(context).home),
BottomNavPharmacyItem(
icon: EvaIcons.person,
@ -95,8 +96,8 @@ class _BottomNavPharmacyBarState extends State<BottomNavPharmacyBar> {
title: TranslationBase.of(context).myAccount,
),
BottomNavPharmacyItem(
icon: EvaIcons.shoppingCart,
activeIcon: EvaIcons.shoppingCart,
icon: EvaIcons.shoppingCartOutline,
activeIcon: EvaIcons.shoppingCartOutline,
changeIndex: _changeIndex,
index: widget.index,
currentIndex: 4,

@ -59,16 +59,16 @@ class BottomNavHomeItem extends StatelessWidget {
Container(
child: Image.asset(
'assets/images/habib-logo.png',
height: 35.0,
),
height: 22.0,
),
SizedBox(
height: 11,
height: 9,
),
Texts(
title,
textAlign: TextAlign.center,
color: currentIndex == index ? secondaryColor : Colors.grey,
textAlign: TextAlign.start,
color: currentIndex == index ? Colors.grey : Colors.grey,
fontSize: 11,
),
// Added TextAlign Property

@ -10,6 +10,7 @@ class BottomNavPharmacyItem extends StatelessWidget {
final int index;
final int currentIndex;
final Function onTap;
final bool isHome;
final IconData activeIcon;
BottomNavPharmacyItem(
@ -19,7 +20,8 @@ class BottomNavPharmacyItem extends StatelessWidget {
this.currentIndex,
this.activeIcon,
this.title,
this.onTap});
this.onTap,
this.isHome = false});
@override
Widget build(BuildContext context) {
@ -49,8 +51,11 @@ class BottomNavPharmacyItem extends StatelessWidget {
),
Container(
child: Icon(currentIndex == index ? activeIcon : icon,
color:
currentIndex == index ? secondaryColor : Colors.grey,
color: isHome
? Color(0xff5AB145)
: currentIndex == index
? Colors.grey
: Colors.grey,
size: 22.0),
),
SizedBox(
@ -61,8 +66,10 @@ class BottomNavPharmacyItem extends StatelessWidget {
Texts(
title,
textAlign: TextAlign.center,
color: currentIndex == index ? secondaryColor : Colors.grey,
fontSize: 11,
color: currentIndex == index ? Colors.grey : Colors.grey,
fontWeight:
currentIndex == index ? FontWeight.bold : FontWeight.w400,
fontSize: currentIndex == index ? 13 : 11,
),
],
),

Loading…
Cancel
Save