adding chat option on dashboard

merge-requests/16/head
Aamir Muhammad 3 years ago
parent 57ebe40b5d
commit 963dcce941

@ -38,8 +38,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
late DashboardProviderModel data; late DashboardProviderModel data;
final GlobalKey<ScaffoldState> _scaffoldState = GlobalKey(); final GlobalKey<ScaffoldState> _scaffoldState = GlobalKey();
final RefreshController _refreshController = final RefreshController _refreshController = RefreshController(initialRefresh: false);
RefreshController(initialRefresh: false);
int currentIndex = 0; int currentIndex = 0;
@ -107,9 +106,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
_scaffoldState.currentState!.openDrawer(); _scaffoldState.currentState!.openDrawer();
}); });
}), }),
Image.asset("assets/images/logos/main_mohemm_logo.png", Image.asset("assets/images/logos/main_mohemm_logo.png", width: 134, height: 28).expanded,
width: 134, height: 28)
.expanded,
SizedBox( SizedBox(
width: 36, width: 36,
height: 36, height: 36,
@ -122,9 +119,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
top: 0, top: 0,
child: Container( child: Container(
padding: const EdgeInsets.only(left: 5, right: 5), padding: const EdgeInsets.only(left: 5, right: 5),
decoration: BoxDecoration( decoration: BoxDecoration(color: MyColors.redColor, borderRadius: BorderRadius.circular(17)),
color: MyColors.redColor,
borderRadius: BorderRadius.circular(17)),
child: "3".toText12(color: Colors.white), child: "3".toText12(color: Colors.white),
), ),
) )
@ -150,11 +145,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
LocaleKeys.goodMorning LocaleKeys.goodMorning.tr().toText14(color: MyColors.grey77Color),
.tr() (AppState().memberInformationList!.eMPLOYEENAME ?? "").toText24(isBold: true),
.toText14(color: MyColors.grey77Color),
(AppState().memberInformationList!.eMPLOYEENAME ?? "")
.toText24(isBold: true),
16.height, 16.height,
Row( Row(
children: [ children: [
@ -167,192 +159,84 @@ class _DashboardScreenState extends State<DashboardScreen> {
? GetAttendanceTrackingShimmer() ? GetAttendanceTrackingShimmer()
: Container( : Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius: BorderRadius.circular(15),
BorderRadius.circular(15), gradient: const LinearGradient(transform: GradientRotation(.46), begin: Alignment.topRight, end: Alignment.bottomLeft, colors: [
gradient: MyColors.gradiantEndColor,
const LinearGradient( MyColors.gradiantStartColor,
transform:
GradientRotation(
.46),
begin: Alignment
.topRight,
end: Alignment
.bottomLeft,
colors: [
MyColors
.gradiantEndColor,
MyColors
.gradiantStartColor,
]), ]),
), ),
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
if (model if (model.isTimeRemainingInSeconds == 0) SvgPicture.asset("assets/images/thumb.svg"),
.isTimeRemainingInSeconds ==
0)
SvgPicture.asset(
"assets/images/thumb.svg"),
Column( Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment
.start,
children: [ children: [
Expanded( Expanded(
child: Column( child: Column(
mainAxisSize: mainAxisSize: MainAxisSize.min,
MainAxisSize crossAxisAlignment: CrossAxisAlignment.start,
.min,
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [ children: [
LocaleKeys LocaleKeys.markAttendance.tr().toText14(color: Colors.white, isBold: true),
.markAttendance if (model.isTimeRemainingInSeconds == 0) "01-02-2022".toText12(color: Colors.white),
.tr() if (model.isTimeRemainingInSeconds != 0)
.toText14(
color: Colors
.white,
isBold:
true),
if (model
.isTimeRemainingInSeconds ==
0)
"01-02-2022".toText12(
color: Colors
.white),
if (model
.isTimeRemainingInSeconds !=
0)
Column( Column(
mainAxisSize: mainAxisSize: MainAxisSize.min,
MainAxisSize crossAxisAlignment: CrossAxisAlignment.start,
.min,
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [ children: [
9.height, 9.height,
CountdownTimer( CountdownTimer(
endTime: model endTime: model.endTime,
.endTime, onEnd: null,
onEnd: endWidget: "00:00:00".toText14(color: Colors.white, isBold: true),
null, textStyle: TextStyle(color: Colors.white, fontSize: 14, letterSpacing: -0.48, fontWeight: FontWeight.bold),
endWidget: "00:00:00".toText14( ),
color: Colors LocaleKeys.timeLeftToday.tr().toText12(color: Colors.white),
.white,
isBold:
true),
textStyle: TextStyle(
color: Colors
.white,
fontSize:
14,
letterSpacing:
-0.48,
fontWeight:
FontWeight.bold),
),
LocaleKeys
.timeLeftToday
.tr()
.toText12(
color:
Colors.white),
9.height, 9.height,
ClipRRect( ClipRRect(
borderRadius: borderRadius: BorderRadius.all(
BorderRadius Radius.circular(20),
.all( ),
Radius.circular( child: LinearProgressIndicator(
20), value: model.progress,
), minHeight: 8,
child: valueColor: const AlwaysStoppedAnimation<Color>(Colors.white),
LinearProgressIndicator( backgroundColor: const Color(0xff196D73),
value: model
.progress,
minHeight:
8,
valueColor:
const AlwaysStoppedAnimation<Color>(Colors.white),
backgroundColor:
const Color(0xff196D73),
), ),
), ),
], ],
), ),
], ],
).paddingOnly( ).paddingOnly(top: 12, right: 15, left: 12),
top: 12,
right: 15,
left: 12),
), ),
Row( Row(
children: [ children: [
Expanded( Expanded(
child: Column( child: Column(
mainAxisSize: mainAxisSize: MainAxisSize.min,
MainAxisSize crossAxisAlignment: CrossAxisAlignment.start,
.min,
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [ children: [
LocaleKeys LocaleKeys.checkIn.tr().toText12(color: Colors.white),
.checkIn (model.attendanceTracking!.pSwipeIn == null ? "--:--" : model.attendanceTracking!.pSwipeIn)
.tr()
.toText12(
color:
Colors.white),
(model.attendanceTracking!.pSwipeIn ==
null
? "--:--"
: model
.attendanceTracking!
.pSwipeIn)
.toString() .toString()
.toText14( .toText14(color: Colors.white, isBold: true),
color: Colors
.white,
isBold:
true),
4.height, 4.height,
], ],
).paddingOnly( ).paddingOnly(left: 12),
left: 12),
), ),
Container( Container(
width: 45, width: 45,
height: 45, height: 45,
padding: padding: const EdgeInsets.only(left: 14, right: 14),
const EdgeInsets decoration: const BoxDecoration(
.only( color: Color(0xff259EA4),
left: 14, borderRadius: BorderRadius.only(
right: bottomRight: Radius.circular(15),
14), ),
decoration: ),
const BoxDecoration( child: SvgPicture.asset(model.isTimeRemainingInSeconds == 0 ? "assets/images/play.svg" : "assets/images/stop.svg"),
color: Color(
0xff259EA4),
borderRadius:
BorderRadius
.only(
bottomRight: Radius
.circular(
15),
),
),
child: SvgPicture.asset(
model.isTimeRemainingInSeconds ==
0
? "assets/images/play.svg"
: "assets/images/stop.svg"),
).onPress(() { ).onPress(() {
showMyBottomSheet( showMyBottomSheet(context, child: MarkAttendanceWidget(model));
context,
child:
MarkAttendanceWidget(
model));
}), }),
], ],
), ),
@ -362,10 +246,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
).onPress( ).onPress(
() { () {
Navigator.pushNamed( Navigator.pushNamed(context, AppRoutes.todayAttendance);
context,
AppRoutes
.todayAttendance);
}, },
)) ))
.animatedSwither(); .animatedSwither();
@ -388,11 +269,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
padding: const EdgeInsets.only(top: 31), padding: const EdgeInsets.only(top: 31),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: const BorderRadius.only( borderRadius: const BorderRadius.only(topRight: Radius.circular(50), topLeft: Radius.circular(50)),
topRight: Radius.circular(50), border: Border.all(color: MyColors.lightGreyEDColor, width: 1),
topLeft: Radius.circular(50)),
border: Border.all(
color: MyColors.lightGreyEDColor, width: 1),
), ),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -408,32 +286,22 @@ class _DashboardScreenState extends State<DashboardScreen> {
LocaleKeys.offers.tr().toText12(), LocaleKeys.offers.tr().toText12(),
Row( Row(
children: [ children: [
LocaleKeys.discounts LocaleKeys.discounts.tr().toText24(isBold: true),
.tr()
.toText24(isBold: true),
6.width, 6.width,
Container( Container(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(left: 8, right: 8),
left: 8, right: 8),
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyColors.yellowColor, color: MyColors.yellowColor,
borderRadius: borderRadius: BorderRadius.circular(10),
BorderRadius.circular(10),
), ),
child: LocaleKeys.newString child: LocaleKeys.newString.tr().toText10(isBold: true)),
.tr()
.toText10(isBold: true)),
], ],
), ),
], ],
), ),
), ),
LocaleKeys.viewAllOffers LocaleKeys.viewAllOffers.tr().toText12(isUnderLine: true).onPress(() {
.tr() Navigator.pushNamed(context, AppRoutes.offersAndDiscounts);
.toText12(isUnderLine: true)
.onPress(() {
Navigator.pushNamed(
context, AppRoutes.offersAndDiscounts);
}) })
], ],
).paddingOnly(left: 21, right: 21), ).paddingOnly(left: 21, right: 21),
@ -444,56 +312,38 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: ListView.separated( child: ListView.separated(
shrinkWrap: true, shrinkWrap: true,
physics: const BouncingScrollPhysics(), physics: const BouncingScrollPhysics(),
padding: const EdgeInsets.only( padding: const EdgeInsets.only(left: 21, right: 21, top: 13),
left: 21, right: 21, top: 13),
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemBuilder: (cxt, index) { itemBuilder: (cxt, index) {
return model.isOffersLoading return model.isOffersLoading
? const OffersShimmerWidget() ? const OffersShimmerWidget()
: InkWell( : InkWell(
onTap: () { onTap: () {
navigateToDetails( navigateToDetails(data.getOffersList[index]);
data.getOffersList[index]);
}, },
child: SizedBox( child: SizedBox(
width: 73, width: 73,
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.center,
CrossAxisAlignment.center,
children: [ children: [
Container( Container(
width: 73, width: 73,
height: 73, height: 73,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius: const BorderRadius.all(
const BorderRadius
.all(
Radius.circular(100), Radius.circular(100),
), ),
border: Border.all( border: Border.all(color: MyColors.lightGreyE3Color, width: 1),
color: MyColors
.lightGreyE3Color,
width: 1),
), ),
child: ClipRRect( child: ClipRRect(
borderRadius: borderRadius: const BorderRadius.all(
const BorderRadius
.all(
Radius.circular(50), Radius.circular(50),
), ),
child: Hero( child: Hero(
tag: "ItemImage" + tag: "ItemImage" + data.getOffersList[index].rowID!,
data transitionOnUserGestures: true,
.getOffersList[
index]
.rowID!,
transitionOnUserGestures:
true,
child: Image.network( child: Image.network(
data data.getOffersList[index].bannerImage!,
.getOffersList[
index]
.bannerImage!,
fit: BoxFit.contain, fit: BoxFit.contain,
), ),
), ),
@ -501,24 +351,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
4.height, 4.height,
Expanded( Expanded(
child: AppState() child: AppState().isArabic(context)
.isArabic(context) ? data.getOffersList[index].titleAR!.toText12(isCenter: true, maxLine: 1)
? data : data.getOffersList[index].title!.toText12(isCenter: true, maxLine: 1),
.getOffersList[
index]
.titleAR!
.toText12(
isCenter:
true,
maxLine: 1)
: data
.getOffersList[
index]
.title!
.toText12(
isCenter:
true,
maxLine: 1),
), ),
], ],
), ),
@ -550,18 +385,14 @@ class _DashboardScreenState extends State<DashboardScreen> {
BottomNavigationBarItem( BottomNavigationBarItem(
icon: SvgPicture.asset( icon: SvgPicture.asset(
"assets/icons/home.svg", "assets/icons/home.svg",
color: currentIndex == 0 color: currentIndex == 0 ? MyColors.grey3AColor : MyColors.grey98Color,
? MyColors.grey3AColor
: MyColors.grey98Color,
).paddingAll(4), ).paddingAll(4),
label: LocaleKeys.home.tr(), label: LocaleKeys.home.tr(),
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: SvgPicture.asset( icon: SvgPicture.asset(
"assets/icons/create_req.svg", "assets/icons/create_req.svg",
color: currentIndex == 1 color: currentIndex == 1 ? MyColors.grey3AColor : MyColors.grey98Color,
? MyColors.grey3AColor
: MyColors.grey98Color,
).paddingAll(4), ).paddingAll(4),
label: LocaleKeys.createRequest.tr(), label: LocaleKeys.createRequest.tr(),
), ),
@ -571,9 +402,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
"assets/icons/work_list.svg", "assets/icons/work_list.svg",
color: currentIndex == 2 color: currentIndex == 2 ? MyColors.grey3AColor : MyColors.grey98Color,
? MyColors.grey3AColor
: MyColors.grey98Color,
).paddingAll(4), ).paddingAll(4),
Consumer<DashboardProviderModel>( Consumer<DashboardProviderModel>(
builder: (cxt, data, child) { builder: (cxt, data, child) {
@ -586,12 +415,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Container( child: Container(
padding: const EdgeInsets.only(left: 4, right: 4), padding: const EdgeInsets.only(left: 4, right: 4),
alignment: Alignment.center, alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(color: MyColors.redColor, borderRadius: BorderRadius.circular(17)),
color: MyColors.redColor, child: data.workListCounter.toString().toText10(color: Colors.white),
borderRadius: BorderRadius.circular(17)),
child: data.workListCounter
.toString()
.toText10(color: Colors.white),
), ),
); );
}, },
@ -603,29 +428,28 @@ class _DashboardScreenState extends State<DashboardScreen> {
BottomNavigationBarItem( BottomNavigationBarItem(
icon: SvgPicture.asset( icon: SvgPicture.asset(
"assets/icons/item_for_sale.svg", "assets/icons/item_for_sale.svg",
color: currentIndex == 3 color: currentIndex == 3 ? MyColors.grey3AColor : MyColors.grey98Color,
).paddingAll(4),
label: LocaleKeys.itemsForSale.tr(),
),
BottomNavigationBarItem(
icon: SvgPicture.asset(
"assets/icons/chat/chat.svg",
color: currentIndex == 4
? MyColors.grey3AColor ? MyColors.grey3AColor
: MyColors.grey98Color, : MyColors.grey98Color,
).paddingAll(4), ).paddingAll(4),
label: LocaleKeys.itemsForSale.tr(), label: LocaleKeys.chat.tr(),
), ),
], ],
currentIndex: currentIndex, currentIndex: currentIndex,
selectedLabelStyle: const TextStyle( selectedLabelStyle: const TextStyle(fontSize: 10, color: MyColors.grey3AColor, fontWeight: FontWeight.w600),
fontSize: 10, unselectedLabelStyle: const TextStyle(fontSize: 10, color: MyColors.grey98Color, fontWeight: FontWeight.w600),
color: MyColors.grey3AColor,
fontWeight: FontWeight.w600),
unselectedLabelStyle: const TextStyle(
fontSize: 10,
color: MyColors.grey98Color,
fontWeight: FontWeight.w600),
type: BottomNavigationBarType.fixed, type: BottomNavigationBarType.fixed,
selectedItemColor: MyColors.grey3AColor, selectedItemColor: MyColors.grey3AColor,
backgroundColor: MyColors.backgroundColor, backgroundColor: MyColors.backgroundColor,
selectedIconTheme: selectedIconTheme: const IconThemeData(color: MyColors.grey3AColor, size: 28),
const IconThemeData(color: MyColors.grey3AColor, size: 28), unselectedIconTheme: const IconThemeData(color: MyColors.grey98Color, size: 28),
unselectedIconTheme:
const IconThemeData(color: MyColors.grey98Color, size: 28),
onTap: (int index) { onTap: (int index) {
if (index == 1) { if (index == 1) {
Navigator.pushNamed(context, AppRoutes.mowadhafhi); Navigator.pushNamed(context, AppRoutes.mowadhafhi);
@ -633,6 +457,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
Navigator.pushNamed(context, AppRoutes.workList); Navigator.pushNamed(context, AppRoutes.workList);
} else if (index == 3) { } else if (index == 3) {
Navigator.pushNamed(context, AppRoutes.itemsForSale); Navigator.pushNamed(context, AppRoutes.itemsForSale);
}else if (index == 4) {
Navigator.pushNamed(context, AppRoutes.chat);
} }
}, },
), ),
@ -656,7 +482,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
} }
}); });
Navigator.pushNamed(context, AppRoutes.offersAndDiscountsDetails, Navigator.pushNamed(context, AppRoutes.offersAndDiscountsDetails, arguments: getOffersDetailList);
arguments: getOffersDetailList);
} }
} }

Loading…
Cancel
Save