@ -60,10 +60,10 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
void initState ( ) {
WidgetsBinding . instance . addObserver ( this ) ;
super . initState ( ) ;
cProvider = Provider . of < ChatProviderModel > ( context , listen: false ) ;
scheduleMicrotask ( ( ) {
data = Provider . of < DashboardProviderModel > ( context , listen: false ) ;
marathonProvider = Provider . of < MarathonProvider > ( context , listen: false ) ;
cProvider = Provider . of < ChatProviderModel > ( context , listen: false ) ;
if ( checkIfPrivilegedForChat ( ) ) {
_bHubCon ( ) ;
}
@ -117,6 +117,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
}
Future < void > checkHubCon ( ) async {
/ / chatHubConnection = await context . read < ChatProviderModel > ( ) . getHubConnection ( ) ;
if ( chatHubConnection . state = = HubConnectionState . Connected ) {
await chatHubConnection . stop ( ) ;
await chatHubConnection . start ( ) ;
@ -151,7 +152,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
data . fetchLeaveTicketBalance ( context , DateTime . now ( ) ) ;
data . fetchMenuEntries ( ) ;
data . fetchEventActivity ( ) ;
data . getCategoryOffersListAPI ( context ) ;
/ / data . getCategoryOffersListAPI ( context ) ;
marathonProvider . getMarathonDetailsFromApi ( ) ;
marathonProvider . getMarathonTutorial ( ) ;
if ( isFromInit ) {
@ -175,10 +176,11 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
if ( list [ ermIndex ] . notificationType = = " Survey " ) {
await Navigator . pushNamed ( context , AppRoutes . survey , arguments: response . mohemmItgResponseItem ! . result ! . data ! . first ) ;
} else {
await Navigator . pushNamed ( context , AppRoutes . advertisement , arguments: {
" masterId " : list [ ermIndex ] . notificationMasterId ,
" advertisement " : response . mohemmItgResponseItem ! . result ! . data ! . first . advertisement ,
} ) ;
await Navigator . pushNamed (
context ,
AppRoutes . advertisement ,
arguments: { " masterId " : list [ ermIndex ] . notificationMasterId , " advertisement " : response . mohemmItgResponseItem ! . result ! . data ! . first . advertisement } ,
) ;
}
}
ermIndex + + ;
@ -235,26 +237,24 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
@ override
Widget build ( BuildContext context ) {
return Scaffold (
return SafeArea (
bottom: Platform . isAndroid ? true : false ,
top: false ,
child: Scaffold (
key: _scaffoldState ,
body: Column (
children: [
Row (
children: [
Builder ( builder: ( BuildContext context ) {
Builder (
builder: ( BuildContext context ) {
return Row (
mainAxisSize: MainAxisSize . min ,
children: [
Image . memory (
Utils . dataFromBase64String (
AppState ( ) . memberInformationList ! . eMPLOYEEIMAGE ? ? " " ,
) ,
Utils . dataFromBase64String ( AppState ( ) . memberInformationList ! . eMPLOYEEIMAGE ? ? " " ) ,
errorBuilder: ( BuildContext context , Object error , StackTrace ? stackTrace ) {
return SvgPicture . asset (
" assets/images/user.svg " ,
height: 34 ,
width: 34 ,
) ;
return SvgPicture . asset ( " assets/images/user.svg " , height: 34 , width: 34 ) ;
} ,
width: 34 ,
height: 34 ,
@ -271,23 +271,19 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
) . onPress ( ( ) {
_scaffoldState . currentState ! . openDrawer ( ) ;
} ) ;
} ) ,
} ,
) ,
Image . asset ( " assets/images/logos/main_mohemm_logo.png " , width: 134 , height: 28 ) . expanded ,
SvgPicture . asset (
" assets/images/announcements.svg " ,
matchTextDirection: true ,
) . onPress ( ( ) async {
SvgPicture . asset ( " assets/images/announcements.svg " , matchTextDirection: true ) . onPress ( ( ) async {
await Navigator . pushNamed ( context , AppRoutes . announcements ) ;
} )
} ) ,
] ,
) . paddingOnly ( left: 21 , right: 21 , top: 48 , bottom: 7 ) ,
Expanded (
child: SmartRefresher (
enablePullDown: true ,
enablePullUp: false ,
header: const MaterialClassicHeader (
color: MyColors . gradiantEndColor ,
) ,
header: const MaterialClassicHeader ( color: MyColors . gradiantEndColor ) ,
controller: _refreshController ,
onRefresh: ( ) {
_onRefresh ( false ) ;
@ -313,10 +309,12 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
: Container (
decoration: BoxDecoration (
borderRadius: BorderRadius . circular ( 15 ) ,
gradient: const LinearGradient ( transform: GradientRotation ( . 46 ) , begin: Alignment . topRight , end: Alignment . bottomLeft , colors: [
MyColors . gradiantEndColor ,
MyColors . gradiantStartColor ,
] ) ,
gradient: const LinearGradient (
transform: GradientRotation ( . 46 ) ,
begin: Alignment . topRight ,
end: Alignment . bottomLeft ,
colors: [ MyColors . gradiantEndColor , MyColors . gradiantStartColor ] ,
) ,
) ,
child: Stack (
alignment: Alignment . center ,
@ -371,9 +369,10 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
crossAxisAlignment: CrossAxisAlignment . start ,
children: [
LocaleKeys . checkIn . tr ( ) . toText12 ( color: Colors . white ) ,
( model . attendanceTracking ! . pSwipeIn = = null ? " --:-- " : model . attendanceTracking ! . pSwipeIn )
. toString ( )
. toText14 ( color: Colors . white , isBold: true ) ,
( model . attendanceTracking ! . pSwipeIn = = null ? " --:-- " : model . attendanceTracking ! . pSwipeIn ) . toString ( ) . toText14 (
color: Colors . white ,
isBold: true ,
) ,
4. height ,
] ,
) . paddingOnly ( left: 12 , right: 12 ) ,
@ -384,19 +383,15 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
height: 45 ,
padding: const EdgeInsets . only ( left: 10 , right: 10 ) ,
decoration: BoxDecoration (
color: Color ( 0xff259EA4 ) ,
color: const Color ( 0xff259EA4 ) ,
borderRadius: BorderRadius . only (
bottomRight: AppState ( ) . isArabic ( context ) ? Radius . circular ( 0 ) : Radius . circular ( 15 ) ,
bottomLeft: AppState ( ) . isArabic ( context ) ? Radius . circular ( 15 ) : Radius . circular ( 0 ) ,
bottomRight: AppState ( ) . isArabic ( context ) ? const Radius . circular ( 0 ) : const Radius . circular ( 15 ) ,
bottomLeft: AppState ( ) . isArabic ( context ) ? const Radius . circular ( 15 ) : const Radius . circular ( 0 ) ,
) ,
) ,
child: SvgPicture . asset ( model . isTimeRemainingInSeconds = = 0 ? " assets/images/biometrics.svg " : " assets/images/biometrics.svg " ) ,
) . onPress ( ( ) {
showMyBottomSheet (
context ,
callBackFunc: ( ) { } ,
child: MarkAttendanceWidget ( model , isFromDashboard: true ) ,
) ;
showMyBottomSheet ( context , callBackFunc: ( ) { } , child: MarkAttendanceWidget ( model , isFromDashboard: true ) ) ;
} ) ,
] ,
) ,
@ -404,11 +399,9 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
) ,
] ,
) ,
) . onPress (
( ) {
) . onPress ( ( ) {
Navigator . pushNamed ( context , AppRoutes . todayAttendance ) ;
} ,
) )
} ) )
. animatedSwither ( ) ;
} ,
) ,
@ -421,12 +414,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
] ,
) . paddingOnly ( left: 21 , right: 21 , top: 7 , bottom: 21 ) ,
eventActivityWidget ( context ) ,
Consumer < DashboardProviderModel > (
builder: ( BuildContext context , DashboardProviderModel model , Widget ? child ) {
if ( ! model . isOffersLoading & & model . getOffersList . isEmpty ) {
return const SizedBox ( ) ;
}
return Column (
Column (
mainAxisSize: MainAxisSize . min ,
crossAxisAlignment: CrossAxisAlignment . start ,
children: [
@ -461,20 +449,21 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
child: RichText (
text:
AppState ( ) . isArabic ( context )
? const TextSpan (
? TextSpan (
children: [
TextSpan (
text: ' اطلع على مميزات ' ,
style: TextStyle ( fontSize: 16 , letterSpacing: - 0.2 , fontWeight: FontWeight . w700 , height: 24 / 16 , color: Color ( 0xFF5D5E5E ) ) ,
style: TextStyle ( fontSize: 16 , letterSpacing: - 0.2 , fontFamily: AppState ( ) . isArabic ( context ) ? ' Cairo ' : ' Poppins ' , fontWeight: FontWeight . w700 , height: 24 / 16 , color: Color ( 0xFF5D5E5E ) ) ,
) ,
TextSpan (
text: ' مزايا ' ,
style: TextStyle (
fontSize: 16 ,
fontFamily: AppState ( ) . isArabic ( context ) ? ' Cairo ' : ' Poppins ' ,
fontWeight: FontWeight . w700 ,
letterSpacing: - 0.2 ,
height: 24 / 16 ,
color: Color ( 0xFFED1C2B ) , / / Use your MAZAYA red color here if defined , e . g . MyColors . mazayaRed
color: MyColors . mazayaRedColor , / / Use your MAZAYA red color here if defined , e . g . MyColors . mazayaRed
) ,
) ,
] ,
@ -483,21 +472,23 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
children: [
TextSpan (
text: LocaleKeys . explore . tr ( ) + ' ' ,
style: const TextStyle ( fontSize: 16 , letterSpacing: - 0.2 , fontWeight: FontWeight . w700 , height: 24 / 16 , color: Color ( 0xFF5D5E5E ) ) ,
style: const TextStyle ( fontSize: 16 , letterSpacing: - 0.2 , fontFamily: ' Poppins ' , fontWeight: FontWeight . w700 , height: 24 / 16 , color: Color ( 0xFF5D5E5E ) ) ,
) ,
TextSpan (
text: LocaleKeys . mazaya . tr ( ) ,
style: const TextStyle (
fontSize: 16 ,
fontWeight: FontWeight . w700 ,
fontFamily: ' Poppins ' ,
letterSpacing: - 0.2 ,
height: 24 / 16 ,
color: Color ( 0xFFED1C2B ) , / / Use your MAZAYA red color here if defined , e . g . MyColors . mazayaRed
color: MyColors . mazayaRedColor , / / Use your MAZAYA red color here if defined , e . g . MyColors . mazayaRed
) ,
) ,
TextSpan (
text: ' ' + LocaleKeys . benefits . tr ( ) ,
style: const TextStyle ( fontSize: 16 , letterSpacing: - 0.2 , fontWeight: FontWeight . w700 , height: 24 / 16 , color: Color ( 0xFF5D5E5E ) ) ,
style: const TextStyle ( fontSize: 16 , letterSpacing: - 0.2 ,
fontFamily: ' Poppins ' , fontWeight: FontWeight . w700 , height: 24 / 16 , color: Color ( 0xFF5D5E5E ) ) ,
) ,
] ,
) ,
@ -519,7 +510,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
children: [
SvgPicture . asset ( " assets/icons/mazaya_brand.svg " , width: 90 , height: 47 ) ,
const SizedBox ( height: 28 ) ,
LocaleKeys . viewAllOffers . tr ( ) . toText12 ( isUnderLine: true , color: const Color ( 0xFF3B3D4A ) ) . onPress ( ( ) {
LocaleKeys . viewallofferMazaya . tr ( ) . toText12 ( isUnderLine: true , color: const Color ( 0xFF3B3D4A ) ) . onPress ( ( ) {
Navigator . pushNamed ( context , AppRoutes . offersAndDiscounts ) ;
} ) ,
] ,
@ -531,110 +522,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
) ,
) . paddingOnly ( left: 21 , right: 21 , top: 0 , bottom: 21 ) ,
) ,
/ / Container (
/ / height: 121 ,
/ / decoration: BoxDecoration (
/ / borderRadius: BorderRadius . circular ( 12 ) ,
/ / border: Border . all ( width: 3 , color: Colors . red ) ,
/ / ) ,
/ / child: Padding ( padding: const EdgeInsets . all ( 4.0 ) , child: Container ( decoration: BoxDecoration ( borderRadius: BorderRadius . circular ( 12 ) , color: Colors . white ) ) ) ,
/ / ) . paddingOnly ( left: 21 , right: 21 , bottom: 21 ) ,
/ / Row (
/ / crossAxisAlignment: CrossAxisAlignment . center ,
/ / children: [
/ / Expanded (
/ / child: Column (
/ / crossAxisAlignment: CrossAxisAlignment . start ,
/ / mainAxisSize: MainAxisSize . min ,
/ / children: [
/ / LocaleKeys . offers . tr ( ) . toText12 ( ) ,
/ / Row (
/ / children: [
/ / LocaleKeys . discounts . tr ( ) . toText24 ( isBold: true ) ,
/ / 6. width ,
/ / Container (
/ / padding: const EdgeInsets . only ( left: 8 , right: 8 ) ,
/ / decoration: BoxDecoration (
/ / color: MyColors . yellowColor ,
/ / borderRadius: BorderRadius . circular ( 10 ) ,
/ / ) ,
/ / child: LocaleKeys . newString . tr ( ) . toText10 ( isBold: true ) ) ,
/ / ] ,
/ / ) ,
/ / ] ,
/ / ) ,
/ / ) ,
/ / LocaleKeys . viewAllOffers . tr ( ) . toText12 ( isUnderLine: true ) . onPress ( ( ) {
/ / Navigator . pushNamed ( context , AppRoutes . offersAndDiscounts ) ;
/ / } )
/ / ] ,
/ / ) . paddingOnly ( left: 21 , right: 21 ) ,
/ / Consumer < DashboardProviderModel > (
/ / builder: ( BuildContext context , DashboardProviderModel model , Widget ? child ) {
/ / return SizedBox (
/ / height: 103 + 33 ,
/ / child: ListView . separated (
/ / shrinkWrap: true ,
/ / physics: const BouncingScrollPhysics ( ) ,
/ / padding: const EdgeInsets . only ( left: 21 , right: 21 , top: 13 ) ,
/ / scrollDirection: Axis . horizontal ,
/ / itemBuilder: ( BuildContext cxt , int index ) {
/ / return model . isOffersLoading
/ / ? const OffersShimmerWidget ( )
/ / : InkWell (
/ / onTap: ( ) {
/ / navigateToDetails ( data . getOffersList [ index ] ) ;
/ / } ,
/ / child: SizedBox (
/ / width: 73 ,
/ / child: Column (
/ / crossAxisAlignment: CrossAxisAlignment . center ,
/ / children: [
/ / Container (
/ / width: 73 ,
/ / height: 73 ,
/ / decoration: BoxDecoration (
/ / color: Colors . white ,
/ / borderRadius: const BorderRadius . all (
/ / Radius . circular ( 100 ) ,
/ / ) ,
/ / border: Border . all ( color: MyColors . lightGreyE3Color , width: 1 ) ,
/ / ) ,
/ / child: ClipRRect (
/ / borderRadius: const BorderRadius . all (
/ / Radius . circular ( 50 ) ,
/ / ) ,
/ / child: Hero (
/ / tag: " ItemImage " + data . getOffersList [ index ] . offersDiscountId . toString ( ) ! ,
/ / transitionOnUserGestures: true ,
/ / child: Image . network (
/ / data . getOffersList [ index ] . logo ? ? " " ,
/ / fit: BoxFit . contain ,
/ / ) ,
/ / ) ,
/ / ) ,
/ / ) ,
/ / 4. height ,
/ / Expanded (
/ / child: AppState ( ) . isArabic ( context )
/ / ? data . getOffersList [ index ] . titleAr ! . toText12 ( isCenter: true , maxLine: 1 )
/ / : data . getOffersList [ index ] . titleEn ! . toText12 ( isCenter: true , maxLine: 1 ) ,
/ / ) ,
/ / ] ,
/ / ) ,
/ / ) ,
/ / ) ;
/ / } ,
/ / separatorBuilder: ( BuildContext cxt , int index ) = > 8. width ,
/ / itemCount: 9 ) ,
/ / ) ;
/ / } ,
/ / ) ,
] ,
) ;
} ,
) ,
Container (
width: double . infinity ,
@ -699,38 +587,24 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
) ,
) ,
) ,
)
] ,
) ,
drawer: SafeArea (
child: AppDrawer ( onLanguageChange: _onRefresh ) ,
] ,
) ,
drawer: AppDrawer ( onLanguageChange: _onRefresh ) ,
bottomNavigationBar: SizedBox (
height: Platform . isAndroid ? 70 : 100 ,
child: BottomNavigationBar (
items: < BottomNavigationBarItem > [
BottomNavigationBarItem ( icon: SvgPicture . asset ( " assets/icons/home.svg " , color: currentIndex = = 0 ? MyColors . grey3AColor : MyColors . grey98Color ) . paddingAll ( 4 ) , label: LocaleKeys . home . tr ( ) ) ,
BottomNavigationBarItem (
icon: SvgPicture . asset (
" assets/icons/home.svg " ,
color: currentIndex = = 0 ? MyColors . grey3AColor : MyColors . grey98Color ,
) . paddingAll ( 4 ) ,
label: LocaleKeys . home . tr ( ) ,
) ,
BottomNavigationBarItem (
icon: SvgPicture . asset (
" assets/icons/create_req.svg " ,
color: currentIndex = = 1 ? MyColors . grey3AColor : MyColors . grey98Color ,
) . paddingAll ( 4 ) ,
icon: SvgPicture . asset ( " assets/icons/create_req.svg " , color: currentIndex = = 1 ? MyColors . grey3AColor : MyColors . grey98Color ) . paddingAll ( 4 ) ,
label: LocaleKeys . mowadhafhiRequest . tr ( ) ,
) ,
BottomNavigationBarItem (
icon: Stack (
alignment: Alignment . centerLeft ,
children: [
SvgPicture . asset (
" assets/icons/work_list.svg " ,
color: currentIndex = = 2 ? MyColors . grey3AColor : MyColors . grey98Color ,
) . paddingAll ( 4 ) ,
SvgPicture . asset ( " assets/icons/work_list.svg " , color: currentIndex = = 2 ? MyColors . grey3AColor : MyColors . grey98Color ) . paddingAll ( 4 ) ,
Consumer < DashboardProviderModel > (
builder: ( BuildContext cxt , DashboardProviderModel data , Widget ? child ) {
if ( data . workListCounter = = 0 ) {
@ -753,10 +627,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
label: LocaleKeys . workList . tr ( ) ,
) ,
BottomNavigationBarItem (
icon: SvgPicture . asset (
" assets/icons/item_for_sale.svg " ,
color: currentIndex = = 3 ? MyColors . grey3AColor : MyColors . grey98Color ,
) . paddingAll ( 4 ) ,
icon: SvgPicture . asset ( " assets/icons/item_for_sale.svg " , color: currentIndex = = 3 ? MyColors . grey3AColor : MyColors . grey98Color ) . paddingAll ( 4 ) ,
label: LocaleKeys . itemsForSale . tr ( ) ,
) ,
BottomNavigationBarItem (
@ -765,7 +636,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
children: [
SvgPicture . asset (
" assets/icons/chat/chat.svg " ,
color: ! checkIfPrivilegedForChat ( )
color:
! checkIfPrivilegedForChat ( )
? MyColors . lightGreyE3Color
: currentIndex = = 4
? MyColors . grey3AColor
@ -817,6 +689,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
} ,
) ,
) ,
) ,
) ;
}
haroon amjad
Aamir Muhammad
Syed Taha Alam
Sultan khan
Sultan khan
taha.alam
taha.alam