From 298b4d6525515292379937e299d7da856ef48448 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Thu, 7 Jan 2021 13:36:30 +0200 Subject: [PATCH] change color --- assets/images/appointment_booking_en.png | Bin 0 -> 6175 bytes assets/images/book_appointment_ar.png | Bin 0 -> 5709 bytes lib/Constants.dart | 3 +++ lib/main.dart | 3 +++ .../E-Referral/e_referral_index_page.dart | 4 ++-- .../BookAppointment/widgets/CardCommon.dart | 4 +++- lib/pages/ContactUs/LiveChat/livechat_page.dart | 6 +++--- lib/pages/DrawerPages/family/my-family.dart | 10 ++++------ lib/pages/MyAppointments/MyAppointments.dart | 8 ++++---- lib/pages/ToDoList/ToDo.dart | 4 ++-- .../insurance/insurance_approval_screen.dart | 8 ++++---- lib/pages/insurance/insurance_card_screen.dart | 4 ++-- lib/pages/insurance/insurance_update_screen.dart | 2 +- lib/pages/medical/allergies_page.dart | 2 +- .../medical/ask_doctor/ask_doctor_home_page.dart | 2 -- .../medical/balance/advance_payment_page.dart | 4 ++-- lib/pages/medical/balance/my_balance_page.dart | 2 +- lib/pages/medical/doctor/doctor_home_page.dart | 6 ++---- lib/pages/medical/eye/EyeHomePage.dart | 1 - lib/pages/medical/labs/labs_home_page.dart | 4 +--- .../blood_pressure/BloodPressureHomePage.dart | 1 - .../blood_suger/blood_sugar_home_page.dart | 1 - lib/pages/medical/patient_sick_leave_page.dart | 4 ++-- .../prescriptions/prescriptions_home_page.dart | 7 ++++--- .../prescriptions/prescriptions_page.dart | 2 -- .../medical/radiology/radiology_home_page.dart | 6 ++---- lib/pages/medical/reports/report_home_page.dart | 13 ++++++------- .../vital_sign/vital_sign_details_screen.dart | 4 ++-- lib/pages/vaccine/my_vaccines_screen.dart | 1 + lib/uitl/utils.dart | 3 ++- .../bottom_navigation_item.dart | 14 ++++++++------ lib/widgets/buttons/floatingActionButton.dart | 4 ++-- .../medical/medical_profile_item.dart | 7 ++----- lib/widgets/others/app_expandable_notifier.dart | 4 +++- 34 files changed, 72 insertions(+), 76 deletions(-) create mode 100644 assets/images/appointment_booking_en.png create mode 100644 assets/images/book_appointment_ar.png create mode 100644 lib/Constants.dart diff --git a/assets/images/appointment_booking_en.png b/assets/images/appointment_booking_en.png new file mode 100644 index 0000000000000000000000000000000000000000..14db8d895d749640278bdaea77858403230fafc9 GIT binary patch literal 6175 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 literal 0 HcmV?d00001 diff --git a/assets/images/book_appointment_ar.png b/assets/images/book_appointment_ar.png new file mode 100644 index 0000000000000000000000000000000000000000..f0bc5aff59a36356b346c5e8f2698f2c08765009 GIT binary patch literal 5709 zcmV-T7P9GyP)005u}1^@s6i_d2*000&gNkl z34B!5y~lqu31qU6g@k~BY(YT8D2o_Su=s?kttf&*U8+UYC)%f06fFW4d9`(`U9=CY zxYbv1Yt`206PKz8E;LF66f_93ldvX05|WvI{wM!C-c0Vy+?lz{xp(gO^SK|AaOd3r zJ?A%P{h$BweK7Duc!bFUPzIn6Uwr{|1yIaa34lTXegK&OI`IeV05k�@w#&kLub5 z;2Qv&_^Jlb=w*2;nKBq*69oW90~iLNoUh{mWF%ouC)Lj+)c!H0T|3RnG8_PxsHYSHh^US_DW)#skmK$B(e(uoC{!NlC_&1 zP%Zf}fY$)L#Nu=%ZWJK(;idtY3cxKd_c?&20G4nc(lxk6fB^uL0bC7WEWMWmHkm;P zzwg@mgLnxCKB*32bs2 z9Xap5;=Gjd%PXS*2l7=lSJ!zptGF%m(lTfTsZD+h|9+ zLV5l)mqE5&d0>|Sdjt3Yz?C*V-{U*3~#mi|Paxj$3`5^ zjmHynLU^NfdFy`4Ma}=GWaqx5ef!1?;~;K4{hCGmer#>x=p=E2-264T2KW_H}AwD zfX|2QvVQ0~k z(9xsFIj%p7&-p&~z55;xuBt>vPENaf$X*(Sce`{NG7Agv%{}+YD#8(5_A^pRBvk=k zF8g##mx(_>>BJvm{|75jJ#PUTw{4I6nY{8LC_Vo?)P4FHc0B#8VYcK99Dt&6-@}2G zA7SVJQm7YgvW__h{pQa>$q&v!{n{_Eeesiq*SYi^TFT%OiXl@n5ymu%Rfsdp@%J^cK@4M)duNqVJ7G-#hO>pl1)!&l4hy zgJN$;hgc^_$AiLMG;!`wD)3jr!A?XHs_d=jY_ttbn zAvEo-vFeqqWNtG1juRE2k7Luh(y4U+ij~;5_$f5)+=X4wzlfbnpEo4kn!mm*1|5{{ z&S(FEegAydkaQ&@z}iS?AtKQx_-fwZ>`Ged>apc_4`cTWFQIAIZo?*mn-A7u(|r$O z`_q3GA`CXVHb_2c;~Ms!(M2LPU?Fd6b{4$usw}U?BiPi0BbzoGz6ud+Xh6f}Z*_|= zq|;srxjT`7NQu;d^JrSlaoIuBDL$H8>xRIwJ)JPB6k;WNA=)#?Ev=JA=Iix{(ksA0 z0B%UlE_?8I%mVy=bid+qbiHUYe3|kG$`3WSz@MEh<_vuXx`SEB_1p}98SjyL1-QVe z(MUy877B^=)gzlXiv@qV9d<%u1WvVeW~V%-HpLxSGjX?g>JcD?#hqe|UDgw10oJ_o zcWhnsn5b2x7hp?Jcw_gx?pi0iZcSnBtd4b)9sw?JvX5VDjn_K3pjyx=2;V`p_F)~0 zkF^tX|3SP_FokS5_}#z@zCEAVA?bg=fqoEI+yOFRM2a?57&usgg{aIV|F8Xt!V zj!G;6_Od!oh=(hg%39JSmH>a6=Eu2u7(*s&Nt0*-%Xad=WmTJ}tQh2|^I@#! zDqhHFx4aas2BafSi(Hij9(Gd1nrcTh0bc7BmxsYa#|1bC?z z$IrtAd|FWzv<4y5yxea~I~i9n;uTCQM`vI7F+O^zbl<0j#m80-WUKw1>%D zpiVwgfD^pj_b{37tCLsv0XsWotEJUw_2o>Th<3+Xuok0OYkLt<1CCF2bFqi`NM~bns4L$yWJ{2g<()N!QPsY6|}U7QEg;&RuPqJ!8{Sa zn#5N{eTDzNr%LgoHN0mT9DdaelFE`8}C|}?&2f5k^s9(V2G*Exf`4Be@H|= z?Q~Lk%(LRmM4S=QF$+8YvNRp$`SegqXT?><3n1g+VG^JC6N%^R;bAbvB)}XmS3PVZ z&+pbVKRg^kmfwqjVJp=99`b5I_mVemEPCHCQ@r1y>S}Dd zZH`RuT2BIW)Hwj%ZoD3u`JKeiwJ-l24OMGww@GF)3ky+j!eCh~Y#{+Q(81yo7^92g zv17s+TEAwUCqQS@NPWP=>7EN7wjr9}{Z7jNJ@37b1D|~+er~AVXuCZgDX}M0iP7N{ zcK-HZugKlQUTT7Or+Y4V*v4+E0k=6R|4(>vNq7*l?v6XL|F5s4lwP2G2m)pOkT<0L zNRduDZ}@gg%Fl3u4K}fh1h~nKZx#zG@NSp=2*smDA*)MC{14o-5PLuV1pEJ0X;>FP z1{)+`Q(6fy^O$bvGxrXZo|$+cu+Ae-5m%2Xld*a66R1rxW{V6qNJRPwkX8f+F1V{r zZPR@CF!p}<5o(vcrP;)hSPIV`kHS+%pmW8k$jr$RpC2&$R`Iv5XWr;I8ze&rkmfR4 z+#Z}Vul&R|1y9Y{*R$uKdB@JEpP~PwT81tXLeHCjitZCzPp=g<*dxD9NB}a}AQ7aw z>Wr&Oy3$hIB>;4EMC_+@>J$V@y9hgK-g+AiI`>x8fAk6JwrxYv=nB-nzZ@H8T!&zN zz3%s+d-pGU8%HzzC_1GzmQ!xuzR2j+Q~X_48v@4|n9QWwKX*4quaf~hGScZTH_$zVg01X*)o0qz6vg;T7Tfyic5@lmuA8Ei@w#6zLY)FC+l#i$d_>L1S_izQ_IV1I!%w8)W~g_ zZ^)i^4*bS@wB`TRzfp87_3uM?RYXb(Cr!lQdlrUGtGxIUZ&Q-Pi;zN|UFiQZ;lj+rHhQDn7oyhIedeRWNFm1Z~9#fu09@h$M zCr>lw8EMRt$XC}A;IjbcwmnY8dT0ZB;qYO|DlH8Q55l9P7VGET71M<&6(ruo?Q}w{ ztu|;0a05?DkFoQG)f>>kwchSG-@?}4{N6P2d6>#_t?pg4&}@tB79hnjA!rY9!`5xs z|N1gZghv~lJWOGcR-%!kV1;bnEm!1~g@*yqx^E8vMydJ|M|Jwcq@BpNlpP6A88B7uozm0<{1mp+epEr^Vt*1rprgCms#gda<5I zXV66xKBd!p)=lVo@syb9kPz43G)tuCB3{s=8NC7=#9KEz*quMI1gJpG8hQy zD1UKDT=A)?nmn!Dv-FBsfy7sN*12vGA)OLl4j}G9$a;@ypoAO~l8KtRL<(OGHMv@! zBVk1A_w~NzCf(^og9JP9p_u*ks8ADMwqTz4;?NhAu3^hw6X`|kLYT}Wdc=nWYC!Oz zhP0N~#p<_FLz%5W1x#1**%LJHO|({_f*SVbYwZe*`g%&UPU0T$(EVX?QS-U;xfj~> z&&on(K|c1q^R6y)i^iRS((~I6_^HrHfC^&p zu<}FX^e+>~?Qi+RA93XC>NcOD!AoI;D5!~EbIBFrvt)P8%dd(w=u#7EY}941(!@u; zvlf&OoyVPlrrkAS1aC68B(lRY(UX!E$+&$}e8W|>lo}cUC?n5!Xx+D8qc)$~x4x*8$0BLAVZpn>izD2T7fok>B z^cJd?0F4?H&{R>oziHU2r@uyaYK^Sv{XZUgI#vuSN9Fi)H3wlmXG~AX?gVILZ6vgC zk<3|f)VW-!<33x^>gOag7?ByRFBH8uwE)T&hQz(@C)c$50#OZU(x7Ca-hqdjWDhI6 zhqu>BhgP$wH^a4Rq-4aaRcmTB%gLf;6E*Q#c4$p<=NiA4nzZn%WImXz0BLjaWjrX6 z3aw^GZ-#4$H__=7M6rR=i8mpw7p*T;v^h_szEm-&V=W}*IhD#`)fC$I1^`c`kVaf+ zjxE&;qXIi&@uO}2Mop2P=??lV&9B9~SG_DpwUO5R8w~YE4k<`7$MAE2XPd3u+Cll3gLv zU@>bTX^c3q`g$+GWqU|~Ryr9_%^C@bPiw$(XpJEPq%xnGY9dAmkS3@nQ_OG!(sC8# zV34X~gkGqBNzJ}e<57)CD>jkc0BXt&m|CjgGEaFrF4ZPjfjnL(aoDYn2Bql=sBcJ9 zBqR{EUm;YZWuvA=sL9uA_SI~CEafjm6M*w$c{wLSB5T2VxD>!MviJ_l4vDe+#kRo$ zsDD?d zM+-e8dAipC@qx?MF!8~J8c^Xk0AjZVX$tkzVl|VrgqEngKMgd<<2v_*!EHvpB+mUS zKh#`@P6ArEzS-zfGpY|5$utE?6vc;CQq&w)WIR&kkFzTd|V0fN^N z$9ORarQmTc3q#g+6U8n8g8LgY09*mURWT_X!a>ga8Fu!|?G&H_IW!KHb&rWlS;2Xp zk~66h$RI$lOZQkl9zx13pDv-1^Z1NZ+~|!&76F1cwb0hSlf1KwO<_6b?LwJCFUurA zh4ow;{--xxV+ggJmt#3^r9wslf@k0tagdt_*bCPqF`78iT26hMggj!UEmi2 zI2XW3-lO6KDEipP0AAyo&h)stcHwpbs_D%BZfDYI4=heu`oKXJ*$R#>v5fn8t|y%Y z7)cQeaVXE3(beCAT9RtFuld}SDn80;MVbzz(prF8Wb??nFMvLL(J=zWe3hsU@y-H} z!#^KZIZ^E6<*z+_?E @override void initState() { super.initState(); - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/live-chat/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/live-chat/ar/0.png')); - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/live-chat/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/live-chat/ar/1.png')); - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/live-chat/en/2.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/live-chat/ar/2.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/live-chat/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/live-chat/ar/0.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/live-chat/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/live-chat/ar/1.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/live-chat/en/2.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/live-chat/ar/2.png')); _tabController = TabController(length: 2, vsync: this); } diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart index d1c0af58..2d7e4270 100644 --- a/lib/pages/DrawerPages/family/my-family.dart +++ b/lib/pages/DrawerPages/family/my-family.dart @@ -72,17 +72,17 @@ class _MyFamily extends State with TickerProviderStateMixin { imagesInfo.add( ImagesInfo( imageEn: - 'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/family-file/en/0.png', + 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/en/0.png', imageAr: - 'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/family-file/ar/0.png'), + 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/ar/0.png'), ); imagesInfo.add( ImagesInfo( imageEn: - 'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/family-file/en/1.png', + 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/en/1.png', imageAr: - 'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/family-file/ar/1.png'), + 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/ar/1.png'), ); projectViewModel = Provider.of(context); return AppScaffold( @@ -130,8 +130,6 @@ class _MyFamily extends State with TickerProviderStateMixin { indicatorWeight: 5.0, //indicatorSize: TabBarIndicatorSize.label, indicatorSize: TabBarIndicatorSize.tab, - - indicatorColor: Theme.of(context).primaryColor, labelColor: Theme.of(context).primaryColor, labelPadding: EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), diff --git a/lib/pages/MyAppointments/MyAppointments.dart b/lib/pages/MyAppointments/MyAppointments.dart index 39dfae41..a49149b5 100644 --- a/lib/pages/MyAppointments/MyAppointments.dart +++ b/lib/pages/MyAppointments/MyAppointments.dart @@ -60,14 +60,14 @@ class _MyAppointmentsState extends State }); imagesInfo.add(ImagesInfo( imageEn: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-appointment/en/0.png', + 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-appointment/en/0.png', imageAr: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-appointment/ar/0.png')); + 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-appointment/ar/0.png')); imagesInfo.add(ImagesInfo( imageEn: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-appointment/en/1.png', + 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-appointment/en/1.png', imageAr: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-appointment/ar/1.png')); + 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-appointment/ar/1.png')); super.initState(); } diff --git a/lib/pages/ToDoList/ToDo.dart b/lib/pages/ToDoList/ToDo.dart index 8d61802f..1066ca15 100644 --- a/lib/pages/ToDoList/ToDo.dart +++ b/lib/pages/ToDoList/ToDo.dart @@ -65,9 +65,9 @@ class _ToDoState extends State { super.initState(); imagesInfo.add(ImagesInfo( imageEn: - 'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/todo/en/0.png', + 'https://hmgwebservices.com/Images/MobileApp/images-info-home/todo/en/0.png', imageAr: - 'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/todo/ar/0.png')); + 'https://hmgwebservices.com/Images/MobileApp/images-info-home/todo/ar/0.png')); int endTime = DateTime.now().millisecondsSinceEpoch + 1000 * 30; controller = CountdownTimerController(endTime: endTime); } diff --git a/lib/pages/insurance/insurance_approval_screen.dart b/lib/pages/insurance/insurance_approval_screen.dart index 4566b082..d81e704e 100644 --- a/lib/pages/insurance/insurance_approval_screen.dart +++ b/lib/pages/insurance/insurance_approval_screen.dart @@ -26,14 +26,14 @@ class _InsuranceApprovalState extends State { Widget build(BuildContext context) { imagesInfo.add(ImagesInfo( imageEn: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/apporvals/en/0.png', + 'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/en/0.png', imageAr: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/apporvals/ar/0.png')); + 'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/ar/0.png')); imagesInfo.add(ImagesInfo( imageEn: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/apporvals/en/1.png', + 'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/en/1.png', imageAr: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/apporvals/ar/1.png')); + 'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/ar/1.png')); return BaseView( onModelReady: widget.appointmentNo != null ? (model) => diff --git a/lib/pages/insurance/insurance_card_screen.dart b/lib/pages/insurance/insurance_card_screen.dart index da59e414..42efc179 100644 --- a/lib/pages/insurance/insurance_card_screen.dart +++ b/lib/pages/insurance/insurance_card_screen.dart @@ -34,9 +34,9 @@ class _InsuranceCardState extends State { Widget build(BuildContext context) { imagesInfo.add(ImagesInfo( imageEn: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/insurance-card/en/0.png', + 'https://hmgwebservices.com/Images/MobileApp/imges-info/insurance-card/en/0.png', imageAr: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/insurance-card/ar/0.png')); + 'https://hmgwebservices.com/Images/MobileApp/imges-info/insurance-card/ar/0.png')); return BaseView( onModelReady: (model) => model.getInsurance(), diff --git a/lib/pages/insurance/insurance_update_screen.dart b/lib/pages/insurance/insurance_update_screen.dart index c26a3bf3..36b424a8 100644 --- a/lib/pages/insurance/insurance_update_screen.dart +++ b/lib/pages/insurance/insurance_update_screen.dart @@ -32,7 +32,7 @@ class _InsuranceUpdateState extends State super.initState(); _tabController = TabController(length: 2, vsync: this); - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/insurance-card/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/insurance-card/ar/0.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/insurance-card/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/insurance-card/ar/0.png')); } void dispose() { diff --git a/lib/pages/medical/allergies_page.dart b/lib/pages/medical/allergies_page.dart index 4a3e5872..459ef0f8 100644 --- a/lib/pages/medical/allergies_page.dart +++ b/lib/pages/medical/allergies_page.dart @@ -11,7 +11,7 @@ class AllergiesPage extends StatelessWidget { List imagesInfo = List(); @override Widget build(BuildContext context) { - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/alllergies/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/alllergies/ar/0.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/alllergies/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/alllergies/ar/0.png')); return BaseView( onModelReady: (model) => model.getAllergies(), builder: (_, model, w) => AppScaffold( diff --git a/lib/pages/medical/ask_doctor/ask_doctor_home_page.dart b/lib/pages/medical/ask_doctor/ask_doctor_home_page.dart index 5f1938fd..902225b1 100644 --- a/lib/pages/medical/ask_doctor/ask_doctor_home_page.dart +++ b/lib/pages/medical/ask_doctor/ask_doctor_home_page.dart @@ -77,8 +77,6 @@ class _AskDoctorHomPageState extends State isScrollable: true, controller: _tabController, indicatorWeight: 5.0, - //indicatorSize: TabBarIndicatorSize.label, - indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, labelPadding: EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), unselectedLabelColor: Colors.grey[800], diff --git a/lib/pages/medical/balance/advance_payment_page.dart b/lib/pages/medical/balance/advance_payment_page.dart index c48906ca..a3005db5 100644 --- a/lib/pages/medical/balance/advance_payment_page.dart +++ b/lib/pages/medical/balance/advance_payment_page.dart @@ -59,9 +59,9 @@ class _AdvancePaymentPageState extends State { getAuthUser(); imagesInfo.add(ImagesInfo( imageEn: - 'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/advance-payment/en/0.png', + 'https://hmgwebservices.com/Images/MobileApp/images-info-home/advance-payment/en/0.png', imageAr: - 'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/advance-payment/ar/0.png')); + 'https://hmgwebservices.com/Images/MobileApp/images-info-home/advance-payment/ar/0.png')); } @override diff --git a/lib/pages/medical/balance/my_balance_page.dart b/lib/pages/medical/balance/my_balance_page.dart index cdedf786..1edbcbf6 100644 --- a/lib/pages/medical/balance/my_balance_page.dart +++ b/lib/pages/medical/balance/my_balance_page.dart @@ -18,7 +18,7 @@ class MyBalancePage extends StatelessWidget { @override Widget build(BuildContext context) { - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/my-balance/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/my-balance/ar/0.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/my-balance/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/my-balance/ar/0.png')); return BaseView( onModelReady: (model) => model.getPatientAdvanceBalanceAmount(), builder: (_, model, w) => AppScaffold( diff --git a/lib/pages/medical/doctor/doctor_home_page.dart b/lib/pages/medical/doctor/doctor_home_page.dart index 80dd2a2e..c8fad3ce 100644 --- a/lib/pages/medical/doctor/doctor_home_page.dart +++ b/lib/pages/medical/doctor/doctor_home_page.dart @@ -19,8 +19,8 @@ class DoctorHomePage extends StatelessWidget { List imagesInfo = List(); @override Widget build(BuildContext context) { - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-doctor/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-doctor/ar/0.png')); - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-doctor/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-doctor/ar/1.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-doctor/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-doctor/ar/0.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-doctor/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-doctor/ar/1.png')); return BaseView( onModelReady: (model) => model.getMyDoctor(), builder: (context, MyDoctorViewModel model, widget) => AppScaffold( @@ -48,7 +48,6 @@ class DoctorHomePage extends StatelessWidget { leading: Radio( value: FilterType.Clinic, groupValue: model.filterType, - activeColor: Colors.red[800], onChanged: (FilterType value) { model.setFilterType(value); }, @@ -65,7 +64,6 @@ class DoctorHomePage extends StatelessWidget { leading: Radio( value: FilterType.Hospital, groupValue: model.filterType, - activeColor: Colors.red[800], onChanged: (FilterType value) => model.setFilterType(value), ), diff --git a/lib/pages/medical/eye/EyeHomePage.dart b/lib/pages/medical/eye/EyeHomePage.dart index 18cc9b77..3f4df55f 100644 --- a/lib/pages/medical/eye/EyeHomePage.dart +++ b/lib/pages/medical/eye/EyeHomePage.dart @@ -75,7 +75,6 @@ class _EyeHomePageState extends State controller: _tabController, indicatorWeight: 5.0, indicatorSize: TabBarIndicatorSize.label, - indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, labelPadding: EdgeInsets.only(top: 4.0, left: 5.0, right: 5.0), diff --git a/lib/pages/medical/labs/labs_home_page.dart b/lib/pages/medical/labs/labs_home_page.dart index 0b3695a0..ce78a7dc 100644 --- a/lib/pages/medical/labs/labs_home_page.dart +++ b/lib/pages/medical/labs/labs_home_page.dart @@ -21,7 +21,7 @@ class LabsHomePage extends StatelessWidget { @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-lab/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-lab/ar/0.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-lab/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-lab/ar/0.png')); return BaseView( onModelReady: (model) => model.getLabs(), builder: (context, LabsViewModel model, widget) => AppScaffold( @@ -48,7 +48,6 @@ class LabsHomePage extends StatelessWidget { leading: Radio( value: FilterType.Clinic, groupValue: model.filterType, - activeColor: Theme.of(context).primaryColor, onChanged: (FilterType value) { model.setFilterType(value); }, @@ -65,7 +64,6 @@ class LabsHomePage extends StatelessWidget { leading: Radio( value: FilterType.Hospital, groupValue: model.filterType, - activeColor: Theme.of(context).primaryColor, onChanged: (FilterType value) => model.setFilterType(value), ), diff --git a/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart b/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart index d2bcde47..e6bb3ed4 100644 --- a/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart +++ b/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart @@ -74,7 +74,6 @@ class _BloodPressureHomePageState extends State controller: _tabController, indicatorWeight: 5.0, indicatorSize: TabBarIndicatorSize.label, - indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, labelPadding: EdgeInsets.only(top: 4.0, left: 5.0, right: 5.0), diff --git a/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart b/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart index c8c7fa4a..9259e286 100644 --- a/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart +++ b/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart @@ -75,7 +75,6 @@ class _BloodSugarHomePageState extends State controller: _tabController, indicatorWeight: 5.0, indicatorSize: TabBarIndicatorSize.label, - indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, labelPadding: EdgeInsets.only(top: 4.0, left: 5.0, right: 5.0), diff --git a/lib/pages/medical/patient_sick_leave_page.dart b/lib/pages/medical/patient_sick_leave_page.dart index f09b8832..196b5d79 100644 --- a/lib/pages/medical/patient_sick_leave_page.dart +++ b/lib/pages/medical/patient_sick_leave_page.dart @@ -23,8 +23,8 @@ class _PatientSickLeavePageState extends State { @override void initState() { imagesInfo.add(ImagesInfo( - imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/sick-leaves/en/0.png', - imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/sick-leaves/ar/0.png')); + imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/sick-leaves/en/0.png', + imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/sick-leaves/ar/0.png')); super.initState(); } diff --git a/lib/pages/medical/prescriptions/prescriptions_home_page.dart b/lib/pages/medical/prescriptions/prescriptions_home_page.dart index 695e3400..96d4aba0 100644 --- a/lib/pages/medical/prescriptions/prescriptions_home_page.dart +++ b/lib/pages/medical/prescriptions/prescriptions_home_page.dart @@ -11,6 +11,8 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import '../../../Constants.dart'; + class HomePrescriptionsPage extends StatefulWidget { @override _HomePrescriptionsPageState createState() => _HomePrescriptionsPageState(); @@ -25,8 +27,8 @@ class _HomePrescriptionsPageState extends State void initState() { super.initState(); _tabController = TabController(length: 2, vsync: this); - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-prescriptions/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-prescriptions/ar/0.png')); - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-prescriptions/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-prescriptions/ar/1.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-prescriptions/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-prescriptions/ar/0.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-prescriptions/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-prescriptions/ar/1.png')); } @override @@ -83,7 +85,6 @@ class _HomePrescriptionsPageState extends State controller: _tabController, indicatorWeight: 5.0, indicatorSize: TabBarIndicatorSize.label, - indicatorColor: Theme.of(context).primaryColor, labelColor: Theme.of(context).primaryColor, labelPadding: EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), diff --git a/lib/pages/medical/prescriptions/prescriptions_page.dart b/lib/pages/medical/prescriptions/prescriptions_page.dart index 79c7b7ff..abf68328 100644 --- a/lib/pages/medical/prescriptions/prescriptions_page.dart +++ b/lib/pages/medical/prescriptions/prescriptions_page.dart @@ -40,7 +40,6 @@ class PrescriptionsPage extends StatelessWidget { leading: Radio( value: FilterType.Clinic, groupValue: prescriptionsViewModel.filterType, - activeColor: Theme.of(context).primaryColor, onChanged: (FilterType value) { prescriptionsViewModel.setFilterType(value); }, @@ -58,7 +57,6 @@ class PrescriptionsPage extends StatelessWidget { leading: Radio( value: FilterType.Hospital, groupValue: prescriptionsViewModel.filterType, - activeColor: Theme.of(context).primaryColor, onChanged: (FilterType value) { prescriptionsViewModel.setFilterType(value); }, diff --git a/lib/pages/medical/radiology/radiology_home_page.dart b/lib/pages/medical/radiology/radiology_home_page.dart index b1b82f93..2123172a 100644 --- a/lib/pages/medical/radiology/radiology_home_page.dart +++ b/lib/pages/medical/radiology/radiology_home_page.dart @@ -19,8 +19,8 @@ class RadiologyHomePage extends StatelessWidget { @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-radiology/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-radiology/ar/0.png')); - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-radiology/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-radiology/ar/1.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/ar/0.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/ar/1.png')); return BaseView( onModelReady: (model) => model.getPatientRadOrders(), builder: (_, model, widget) => AppScaffold( @@ -46,7 +46,6 @@ class RadiologyHomePage extends StatelessWidget { leading: Radio( value: FilterType.Clinic, groupValue: model.filterType, - activeColor: Theme.of(context).primaryColor, onChanged: (FilterType value) { model.setFilterType(value); }, @@ -64,7 +63,6 @@ class RadiologyHomePage extends StatelessWidget { leading: Radio( value: FilterType.Hospital, groupValue: model.filterType, - activeColor: Theme.of(context).primaryColor, onChanged: (FilterType value) { model.setFilterType(value); }, diff --git a/lib/pages/medical/reports/report_home_page.dart b/lib/pages/medical/reports/report_home_page.dart index c57dd3e9..d3c818ff 100644 --- a/lib/pages/medical/reports/report_home_page.dart +++ b/lib/pages/medical/reports/report_home_page.dart @@ -42,19 +42,19 @@ class _HomeReportPageState extends State ProjectViewModel projectViewModel = Provider.of(context); imagesInfo.add(ImagesInfo( imageEn: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/medical-reorts/en/0.png', + 'https://hmgwebservices.com/Images/MobileApp/imges-info/medical-reorts/en/0.png', imageAr: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/medical-reorts/ar/0.png')); + 'https://hmgwebservices.com/Images/MobileApp/imges-info/medical-reorts/ar/0.png')); imagesInfo.add(ImagesInfo( imageEn: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/medical-reorts/en/1.png', + 'https://hmgwebservices.com/Images/MobileApp/imges-info/medical-reorts/en/1.png', imageAr: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/medical-reorts/ar/1.png')); + 'https://hmgwebservices.com/Images/MobileApp/imges-info/medical-reorts/ar/1.png')); imagesInfo.add(ImagesInfo( imageEn: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/medical-reorts/en/2.png', + 'https://hmgwebservices.com/Images/MobileApp/imges-info/medical-reorts/en/2.png', imageAr: - 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/medical-reorts/ar/2.png')); + 'https://hmgwebservices.com/Images/MobileApp/imges-info/medical-reorts/ar/2.png')); return BaseView( onModelReady: (model) => model.getReports(), //model.getPrescriptions(), builder: (_, model, widget) => AppScaffold( @@ -102,7 +102,6 @@ class _HomeReportPageState extends State controller: _tabController, indicatorWeight: 5.0, indicatorSize: TabBarIndicatorSize.label, - indicatorColor: Theme.of(context).primaryColor, labelColor: Theme.of(context).primaryColor, unselectedLabelColor: Colors.grey[800], tabs: [ diff --git a/lib/pages/medical/vital_sign/vital_sign_details_screen.dart b/lib/pages/medical/vital_sign/vital_sign_details_screen.dart index 18b1ca08..4d141b5f 100644 --- a/lib/pages/medical/vital_sign/vital_sign_details_screen.dart +++ b/lib/pages/medical/vital_sign/vital_sign_details_screen.dart @@ -24,8 +24,8 @@ class VitalSignDetailsScreen extends StatelessWidget { @override Widget build(BuildContext context) { - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-vital-signs/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-vital-signs/ar/0.png')); - imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-vital-signs/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-vital-signs/ar/1.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/ar/0.png')); + imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/ar/1.png')); return BaseView( onModelReady: appointmentNo != null && projectID != null ? (model) => model.getPatientVitalSign( diff --git a/lib/pages/vaccine/my_vaccines_screen.dart b/lib/pages/vaccine/my_vaccines_screen.dart index 3e81c41c..169e5cd5 100644 --- a/lib/pages/vaccine/my_vaccines_screen.dart +++ b/lib/pages/vaccine/my_vaccines_screen.dart @@ -16,6 +16,7 @@ import 'package:popup_box/popup_box.dart'; import 'my_vaccines_item_screen.dart'; +//TODO fix by jammal we have a static data class MyVaccines extends StatefulWidget { @override _MyVaccinesState createState() => _MyVaccinesState(); diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index 34c0e58d..58ef9421 100644 --- a/lib/uitl/utils.dart +++ b/lib/uitl/utils.dart @@ -32,6 +32,7 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import '../Constants.dart'; import 'app_shared_preferences.dart'; import 'app_toast.dart'; @@ -214,7 +215,7 @@ class Utils { toAnimate: false, position: BadgePosition.topEnd(), shape: BadgeShape.circle, - badgeColor: Color(0xFF40ACC9).withOpacity(1.0), + badgeColor: secondaryColor.withOpacity(1.0), borderRadius: BorderRadius.circular(8), badgeContent: Container( padding: EdgeInsets.all(2.0), diff --git a/lib/widgets/bottom_navigation/bottom_navigation_item.dart b/lib/widgets/bottom_navigation/bottom_navigation_item.dart index 8443f26d..391b6a3d 100644 --- a/lib/widgets/bottom_navigation/bottom_navigation_item.dart +++ b/lib/widgets/bottom_navigation/bottom_navigation_item.dart @@ -8,6 +8,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../../Constants.dart'; + class BottomNavigationItem extends StatelessWidget { final IconData icon; final IconData activeIcon; @@ -49,7 +51,7 @@ class BottomNavigationItem extends StatelessWidget { Container( child: Icon(currentIndex == index ? activeIcon : icon, color: currentIndex == index - ? Theme.of(context).primaryColor + ? secondaryColor : Theme.of(context).dividerColor, size: 22.0), ), @@ -60,7 +62,7 @@ class BottomNavigationItem extends StatelessWidget { name, textAlign: TextAlign.center, color: currentIndex == index - ? Theme.of(context).primaryColor + ? secondaryColor : Colors.grey, fontSize: 11, ), @@ -80,7 +82,7 @@ class BottomNavigationItem extends StatelessWidget { toAnimate: false, position: BadgePosition.topEnd(), shape: BadgeShape.circle, - badgeColor: Color(0xFF40ACC9).withOpacity(1.0), + badgeColor: secondaryColor.withOpacity(1.0), borderRadius: BorderRadius.circular(8), badgeContent: Container( padding: EdgeInsets.all(2.0), @@ -101,7 +103,7 @@ class BottomNavigationItem extends StatelessWidget { child: Icon( currentIndex == index ? activeIcon : icon, color: currentIndex == index - ? Theme.of(context).primaryColor + ? secondaryColor : Theme.of(context).dividerColor, size: 22.0), ), @@ -134,7 +136,7 @@ class BottomNavigationItem extends StatelessWidget { child: Icon( currentIndex == index ? activeIcon : icon, color: currentIndex == index - ? Theme.of(context).primaryColor + ? secondaryColor : Theme.of(context).dividerColor, size: 22.0), ), @@ -145,7 +147,7 @@ class BottomNavigationItem extends StatelessWidget { name, textAlign: TextAlign.center, color: currentIndex == index - ? Theme.of(context).primaryColor + ? secondaryColor : Colors.grey, fontSize: 11, ), diff --git a/lib/widgets/buttons/floatingActionButton.dart b/lib/widgets/buttons/floatingActionButton.dart index 4afd72b3..85efdb9c 100644 --- a/lib/widgets/buttons/floatingActionButton.dart +++ b/lib/widgets/buttons/floatingActionButton.dart @@ -87,8 +87,8 @@ class _FloatingButtonState extends State ]), child: Image.asset( projectViewModel.isArabic - ? 'assets/images/booking_ar.png' - : 'assets/images/booking_en.png', + ? 'assets/images/book_appointment_ar.png' + : 'assets/images/appointment_booking_en.png', // fit: BoxFit.cover, width: 90, height: 90, diff --git a/lib/widgets/data_display/medical/medical_profile_item.dart b/lib/widgets/data_display/medical/medical_profile_item.dart index 6aadb3e0..7fd97f52 100644 --- a/lib/widgets/data_display/medical/medical_profile_item.dart +++ b/lib/widgets/data_display/medical/medical_profile_item.dart @@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/widgets/others/rounded_container_widget.dar import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../../../Constants.dart'; import '../text.dart'; class MedicalProfileItem extends StatelessWidget { @@ -26,11 +27,7 @@ class MedicalProfileItem extends StatelessWidget { borderWidth: 0, margin: 4, height: 120, - // MediaQuery.of(context).size.height * 0.12, child: Container( - //width: MediaQuery.of(context).size.width * 0.25, - // width: MediaQuery.of(context).size.width* 0.40, - padding: EdgeInsets.all(10), child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -38,7 +35,7 @@ class MedicalProfileItem extends StatelessWidget { children: [ Texts(title, fontSize: 1.5 * SizeConfig.textMultiplier, - color: Theme.of(context).primaryColor, + color: secondaryColor, fontWeight: FontWeight.bold), Texts(subTitle,fontSize: 1.4 * SizeConfig.textMultiplier,), Align( diff --git a/lib/widgets/others/app_expandable_notifier.dart b/lib/widgets/others/app_expandable_notifier.dart index c5d3ec6f..1a837f9f 100644 --- a/lib/widgets/others/app_expandable_notifier.dart +++ b/lib/widgets/others/app_expandable_notifier.dart @@ -3,6 +3,8 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:expandable/expandable.dart'; import 'package:flutter/material.dart'; +import '../../Constants.dart'; + /// App Expandable Notifier with animation /// [headerWidget] widget want to show in the header /// [bodyWidget] widget want to show in the body @@ -81,7 +83,7 @@ class _AppExpandableNotifier extends State { height: 28.0, width: 30.0, decoration: new BoxDecoration( - color: Color(0xFF40ACC9), + color: secondaryColor, shape: BoxShape.circle, ), child: new Center(