improve home page to match the xd

middle_screen
Elham Rababah 4 years ago
parent cc7fedc8f5
commit a5ea23c38e

@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]";
const ONLY_LETTERS = "[a-zA-Z &'\"]";
const ONLY_DATE = "[0-9/]";
const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
// const BASE_URL = 'https://hmgwebservices.com/';
const BASE_URL = 'https://uat.hmgwebservices.com/';
const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'https://uat.hmgwebservices.com/';
const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";

@ -0,0 +1,41 @@
// ignore: must_be_immutable
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';
// ignore: must_be_immutable
class Label extends StatelessWidget {
Label({
Key key, this.firstLine, this.secondLine, this.color,
}) : super(key: key);
final String firstLine;
final String secondLine;
Color color;
@override
Widget build(BuildContext context) {
if(color == null) {
color = Color(0xFF2E303A);
}
return Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
firstLine,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3 ,
// fontWeight: FontWeight.bold,
color: color,
fontHeight: .5,
),
AppText(
secondLine,
color: color,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 5,
fontWeight: FontWeight.bold,
),
],
);
}
}

@ -10,6 +10,8 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:flutter/material.dart';
import 'Label.dart';
class DashboardReferralPatient extends StatelessWidget {
final List<DashboardModel> dashboardItemList;
@ -55,21 +57,13 @@ class DashboardReferralPatient extends StatelessWidget {
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context)
.patients,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3,
fontWeight: FontWeight.bold,
fontHeight: 0.5,
),
AppText(
TranslationBase.of(context)
.referral,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 5,
fontWeight: FontWeight.bold,
SizedBox(
height: SizeConfig.getHeightMultiplier(height: height) * (SizeConfig.isHeightVeryShort?3:SizeConfig.isHeightShort?2: 2)
),
Label(firstLine:TranslationBase.of(context).patients ,secondLine:TranslationBase.of(context).referral,color: Color(0xFF2B353E), ),
SizedBox(
height: SizeConfig.getHeightMultiplier(height: height) * (SizeConfig.isHeightVeryShort?5:SizeConfig.isHeightShort?14: 20)
height: SizeConfig.getHeightMultiplier(height: height) * (SizeConfig.isHeightVeryShort?5:SizeConfig.isHeightShort?10: 12)
)
],
),),

@ -1,9 +1,11 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/widgets/dashboard/activity_card.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';
import 'Label.dart';
class DashboardSliderItemWidget extends StatelessWidget {
final DashboardModel item;
@ -13,18 +15,18 @@ class DashboardSliderItemWidget extends StatelessWidget {
Widget build(BuildContext context) {
return Column(
children: [
Row(
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
AppText(
item.kPIName,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4,
fontWeight: FontWeight.bold,
),
Label(firstLine:Helpers.getLabelFromKPI(item.kPIName) ,secondLine:Helpers.getNameFromKPI(item.kPIName), ),
],
),
new Container(
height: SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightShort?14:12),
new Container(
height: SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightShort?14:13),
child: ListView(
scrollDirection: Axis.horizontal,
children:

@ -26,7 +26,7 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
@override
Widget build(BuildContext context) {
double height = SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 40 : 37);
(SizeConfig.isHeightVeryShort ? 40 : 31);
return Container(
height: height,
// height: 230,

@ -22,7 +22,7 @@ class HomePatientCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
double width = SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightVeryShort?14:11);
double width = SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightVeryShort?14:13);
return HomePageCard(
color: backgroundColor,
width: width,

@ -1,5 +1,4 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart';
import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';
@ -17,19 +16,15 @@ import 'package:doctor_app_flutter/screens/patients/out_patient/out_patient_scre
import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_screen.dart';
import 'package:doctor_app_flutter/screens/patients/profile/referral/patient_referral_screen.dart';
import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:sticky_headers/sticky_headers/widget.dart';
import '../../widgets/shared/app_texts_widget.dart';
import 'Label.dart';
import 'home_screen_header.dart';
class HomeScreen extends StatefulWidget {
HomeScreen({Key key, this.title}) : super(key: key);
@ -48,7 +43,7 @@ class _HomeScreenState extends State<HomeScreen> {
bool isExpanded = false;
bool isInpatient = false;
int sliderActiveIndex = 0;
var clinicId;
String clinicId;
AuthenticationViewModel authenticationViewModel;
int colorIndex = 0;
@ -72,240 +67,91 @@ class _HomeScreenState extends State<HomeScreen> {
},
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
isShowAppBar: false,
isShowAppBar: true,
appBar: HomeScreenHeader(
model: model,
),
body: ListView(children: [
Column(children: <Widget>[
StickyHeader(
header: Container(
color: Colors.grey[100],
child: Stack(children: [
IconButton(
icon: Image.asset(
'assets/images/menu.png',
width: SizeConfig.widthMultiplier * 7,
),
iconSize: SizeConfig.heightMultiplier * 2,
color: Colors.black,
onPressed: () => Scaffold.of(context).openDrawer(),
),
Column(
children: <Widget>[
ProfileWelcomeWidget(
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
width: MediaQuery.of(context).size.width * .6,
child: projectsProvider.doctorClinicsList.length >
0
? Stack(
children: [
DropdownButtonHideUnderline(
child: DropdownButton(
dropdownColor: Colors.white,
iconEnabledColor: Colors.black,
isExpanded: true,
value: clinicId == null
? projectsProvider
.doctorClinicsList[0].clinicID
: clinicId,
iconSize: SizeConfig.widthMultiplier* 7,
elevation: 16,
selectedItemBuilder:
(BuildContext context) {
return projectsProvider
.doctorClinicsList
.map((item) {
return Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.end,
children: <Widget>[
Column(
mainAxisAlignment:
MainAxisAlignment
.center,
children: [
Container(
padding:
EdgeInsets.all(2),
margin:
EdgeInsets.all(2),
decoration:
new BoxDecoration(
color:
Colors.red[800],
borderRadius:
BorderRadius
.circular(
20),
),
constraints:
BoxConstraints(
minWidth: SizeConfig.widthMultiplier* 5.5,
minHeight: SizeConfig.widthMultiplier* 5,
),
child: Center(
child: AppText(
projectsProvider
.doctorClinicsList
.length
.toString(),
color:
Colors.white,
fontSize:
projectsProvider
.isArabic
? SizeConfig.widthMultiplier* 3.5
: SizeConfig.widthMultiplier* 3,
textAlign:
TextAlign
.center,
),
)),
],
),
AppText(item.clinicName,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: MediaQuery.of(context).size.width * .6) * 5,
color: Colors.black,
textOverflow:TextOverflow.ellipsis ,
fontWeight:
FontWeight.bold,
textAlign: TextAlign.end),
],
);
}).toList();
},
onChanged: (newValue) async {
clinicId = newValue;
GifLoaderDialogUtils.showMyDialog(
context);
await model.changeClinic(newValue,
authenticationViewModel);
GifLoaderDialogUtils.hideDialog(
context);
if (model.state ==
ViewState.ErrorLocal) {
DrAppToastMsg.showErrorToast(
model.error);
}
},
items: projectsProvider
.doctorClinicsList
.map((item) {
return DropdownMenuItem(
child: AppText(
item.clinicName,
textAlign: TextAlign.left,
),
value: item.clinicID,
);
}).toList(),
)),
],
)
: AppText(
TranslationBase
.of(context)
.noClinic),
),
],
),
isClinic: true,
height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 10 : 8),
),
])
])),
content: Column(
children: [
model.dashboardItemsList.length > 0
? DashboardSwipeWidget(
model.dashboardItemsList,
model,
(sliderIndex) {
setState(() {
sliderActiveIndex = sliderIndex;
});
},
)
: SizedBox(),
model.dashboardItemsList.length > 0
? FractionallySizedBox(
widthFactor: 0.90,
child: Container(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
SizedBox(
height: 10,
),
sliderActiveIndex == 1
? DashboardSliderItemWidget(
model.dashboardItemsList[4])
: sliderActiveIndex == 0
? DashboardSliderItemWidget(
model.dashboardItemsList[3])
: DashboardSliderItemWidget(
model.dashboardItemsList[6]),
],
),
),
)
: SizedBox(),
FractionallySizedBox(
// widthFactor: 0.90,
model.dashboardItemsList.length > 0
? DashboardSwipeWidget(
model.dashboardItemsList,
model,
(sliderIndex) {
setState(() {
sliderActiveIndex = sliderIndex;
});
},
)
: SizedBox(),
model.dashboardItemsList.length > 0
? FractionallySizedBox(
widthFactor: 0.90,
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.only(
topRight: Radius.circular(50),
)),
padding: EdgeInsets.only(left: 20, top: 10, right: 20),
margin: EdgeInsets.only(top: 10),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
SizedBox(
height: SizeConfig.heightMultiplier *1,),
Container(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).patients,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* 3,
fontWeight: FontWeight.bold,
fontHeight: .5,
),
AppText(
TranslationBase.of(context).services,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* 6,
fontWeight: FontWeight.bold,
),
],
)),
SizedBox(
height: SizeConfig.heightMultiplier *1,
height: SizeConfig.heightMultiplier * 5,
),
Container(
height: SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightShort?14:11),
child: ListView(
scrollDirection: Axis.horizontal,
children: [
...homePatientsCardsWidget(model),
],),),
SizedBox(
height: SizeConfig.heightMultiplier *1,),
sliderActiveIndex == 1
? DashboardSliderItemWidget(
model.dashboardItemsList[4])
: sliderActiveIndex == 0
? DashboardSliderItemWidget(
model.dashboardItemsList[3])
: DashboardSliderItemWidget(
model.dashboardItemsList[6]),
],
),
),
),
],
)
: SizedBox(),
FractionallySizedBox(
// widthFactor: 0.90,
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.only(
topRight: Radius.circular(50),
)),
padding: EdgeInsets.only(left: 20, top: 10, right: 20),
margin: EdgeInsets.only(top: 10),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
SizedBox(
height: SizeConfig.heightMultiplier * 2,
),
Container(
child: Label(
firstLine: TranslationBase.of(context).patients,
secondLine: TranslationBase.of(context).services,
)),
SizedBox(
height: SizeConfig.heightMultiplier * 1,
),
Container(
height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort
? 16
: SizeConfig.isHeightShort
? 14
: 13),
child: ListView(
scrollDirection: Axis.horizontal,
children: [
...homePatientsCardsWidget(model),
],
),
),
SizedBox(height: SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?6:SizeConfig.isHeightShort?4:3))
],
),
),
)
),
]),
]),
),
@ -461,3 +307,6 @@ class _HomeScreenState extends State<HomeScreen> {
}
}
}

@ -0,0 +1,205 @@
// ignore: must_be_immutable
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
// ignore: must_be_immutable
class HomeScreenHeader extends StatefulWidget with PreferredSizeWidget {
final DashboardViewModel model;
double height = SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 10 : 6);
HomeScreenHeader({Key key, this.model}) : super(key: key);
@override
_HomeScreenHeaderState createState() => _HomeScreenHeaderState();
@override
// TODO: implement preferredSize
Size get preferredSize => Size(double.maxFinite,height);
}
class _HomeScreenHeaderState extends State<HomeScreenHeader> {
ProjectViewModel projectsProvider;
var clinicId;
AuthenticationViewModel authenticationViewModel;
@override
Widget build(BuildContext context) {
ProjectViewModel projectsProvider = Provider.of<ProjectViewModel>(context);
authenticationViewModel = Provider.of<AuthenticationViewModel>(context);
return Container(
color: Colors.grey[100],
child: Stack(children: [
IconButton(
icon: Image.asset(
'assets/images/menu.png',
width: SizeConfig.widthMultiplier * 7,
),
iconSize: SizeConfig.heightMultiplier * 2,
color: Colors.black,
onPressed: () => Scaffold.of(context).openDrawer(),
),
Column(
children: <Widget>[
ProfileWelcomeWidget(
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
width: MediaQuery
.of(context)
.size
.width * .6,
child: projectsProvider.doctorClinicsList.length >
0
? Stack(
children: [
DropdownButtonHideUnderline(
child: DropdownButton(
dropdownColor: Colors.white,
iconEnabledColor: Colors.black,
isExpanded: true,
value: clinicId == null
? projectsProvider
.doctorClinicsList[0].clinicID
: clinicId,
iconSize: SizeConfig.widthMultiplier * 7,
elevation: 16,
selectedItemBuilder:
(BuildContext context) {
return projectsProvider
.doctorClinicsList
.map((item) {
return Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.end,
children: <Widget>[
Column(
mainAxisAlignment:
MainAxisAlignment
.center,
children: [
Container(
padding:
EdgeInsets.all(2),
margin:
EdgeInsets.all(2),
decoration:
new BoxDecoration(
color:
Colors.red[800],
borderRadius:
BorderRadius
.circular(
20),
),
constraints:
BoxConstraints(
minWidth: SizeConfig
.widthMultiplier * 5.5,
minHeight: SizeConfig
.widthMultiplier * 5,
),
child: Center(
child: AppText(
projectsProvider
.doctorClinicsList
.length
.toString(),
color:
Colors.white,
fontSize:
projectsProvider
.isArabic
? SizeConfig
.widthMultiplier * 3.5
: SizeConfig
.widthMultiplier * 3,
textAlign:
TextAlign
.center,
),
)),
],
),
AppText(item.clinicName,
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth(
width: MediaQuery
.of(context)
.size
.width * .6) * 5,
color: Colors.black,
textOverflow: TextOverflow
.ellipsis,
fontWeight:
FontWeight.bold,
textAlign: TextAlign.end),
],
);
}).toList();
},
onChanged: (newValue) async {
setState(() {
clinicId = newValue;
});
GifLoaderDialogUtils.showMyDialog(
context);
await widget.model.changeClinic(newValue,
authenticationViewModel);
GifLoaderDialogUtils.hideDialog(
context);
if (widget.model.state ==
ViewState.ErrorLocal) {
DrAppToastMsg.showErrorToast(
widget.model.error);
}
},
items: projectsProvider
.doctorClinicsList
.map((item) {
return DropdownMenuItem(
child: AppText(
item.clinicName,
textAlign: TextAlign.left,
),
value: item.clinicID,
);
}).toList(),
)),
],
)
: AppText(
TranslationBase
.of(context)
.noClinic),
),
],
),
isClinic: true,
height: widget.height,
),
])
]));
}
}

@ -1,11 +1,8 @@
import 'package:connectivity/connectivity.dart';
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_response_model.dart';
import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart';
import 'package:doctor_app_flutter/screens/auth/login_screen.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -270,4 +267,19 @@ class Helpers {
var htmlRegex = RegExp("<(“[^”]*”|'[^]*|[^'”>])*>");
return htmlRegex.hasMatch(text);
}
static getNameFromKPI(String kpi) {
if (kpi.indexOf("(") > -1)
return kpi.substring(0, kpi.indexOf("("));
else
return kpi;
}
static getLabelFromKPI(String kpi) {
if (kpi.indexOf("(") > -1 && kpi.indexOf(")")>-1)
return kpi.substring(kpi.indexOf("(") + 1, kpi.indexOf(")"));
else
return '';
}
}

@ -9,7 +9,7 @@ class GetActivityCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
double width = SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightShort?14:12);
double width = SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightShort?14:13);
return Container(
width: width,
padding: EdgeInsets.symmetric(horizontal: SizeConfig.heightMultiplier * .4, vertical: SizeConfig.heightMultiplier * .2),

@ -1,5 +1,8 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart';
import 'package:doctor_app_flutter/screens/home/Label.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';
@ -21,20 +24,19 @@ class GetOutPatientStack extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Container(
child: AppText(
value.kPIName,
medium: true,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4,
),
padding: EdgeInsets.symmetric(horizontal: 5,vertical: 5),
child: Label(firstLine:Helpers.getLabelFromKPI(value.kPIName) ,secondLine:Helpers.getNameFromKPI(value.kPIName),color: Color(0xFF2B353E), ),
),
Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: list)
],
);
}
getStack(Summaryoptions value, max,context) {
double barHeight = SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 23 : 25);
(SizeConfig.isHeightVeryShort ? 23 : 19);
return Expanded(
child: Container(
margin: EdgeInsets.symmetric(horizontal: 2),
@ -98,4 +100,5 @@ class GetOutPatientStack extends StatelessWidget {
),
);
}
}

@ -23,7 +23,7 @@ class BottomNavigationItem extends StatelessWidget {
return Expanded(
child: SizedBox(
height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 10 : 6),
(SizeConfig.isHeightVeryShort ? 10 :SizeConfig.isHeightShort ? 6: 7),
child: Material(
type: MaterialType.transparency,
child: InkWell(
@ -49,11 +49,10 @@ class BottomNavigationItem extends StatelessWidget {
Expanded(
child: Text(
name,
style: TextStyle(
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3,
color: currentIndex == index
? Theme.of(context).primaryColor
? Color(0xFF333C45)
: Theme.of(context).dividerColor,
),
),

Loading…
Cancel
Save