Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'change_color' into 'master'

Browse Source 
change color

See merge request Cloud_Solution/diplomatic-quarter!229
merge-requests/230/head
Mohammad Aljammal 4 years ago
parent 71417da030 298b4d6525
commit fa38d55c05
34 changed files with 72 additions and 76 deletions
Show Stats Download Patch File Download Diff File

BIN
assets/images/appointment_booking_en.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
assets/images/book_appointment_ar.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

3
lib/Constants.dart
Unescape Escape View File

@ -0,0 +1,3 @@
import 'package:flutter/material.dart';
final Color secondaryColor = Colors.red[800];

3
lib/main.dart
Unescape Escape View File

@ -13,6 +13,7 @@ import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart';
import 'Constants.dart';
import 'config/size_config.dart';
import 'core/model/geofencing/requests/GeoZonesRequestModel.dart';
import 'core/service/geofencing/GeofencingServices.dart';
@ -91,6 +92,8 @@ class MyApp extends StatelessWidget {
highlightColor: Colors.grey[100].withOpacity(0.4),
splashColor: Colors.transparent,
primaryColor: Colors.grey,
toggleableActiveColor: secondaryColor,
indicatorColor: secondaryColor,
bottomSheetTheme: BottomSheetThemeData(backgroundColor: HexColor('#E0E0E0')),
cursorColor: Colors.grey,
iconTheme: IconThemeData(),

4
lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart
Unescape Escape View File

@ -48,8 +48,8 @@ class EReferralIndexPage extends StatelessWidget {
width: MediaQuery.of(context).size.width * 0.50,
child: CarouselSlider(
imagesUrlList: [
"https://hmgwebservices.com/Images/MobileAppDq/images-info-home/referal/en/0.png",
"https://hmgwebservices.com/Images/MobileAppDq/images-info-home/referal/en/1.png"
"https://hmgwebservices.com/Images/MobileApp/images-info-home/referal/en/0.png",
"https://hmgwebservices.com/Images/MobileApp/images-info-home/referal/en/1.png"
],
),
),

4
lib/pages/BookAppointment/widgets/CardCommon.dart
Unescape Escape View File

@ -1,6 +1,8 @@
import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart';
import 'package:flutter/material.dart';
import '../../../Constants.dart';
class CardCommon extends StatelessWidget {
final image;
final text;
@ -31,7 +33,7 @@ class CardCommon extends StatelessWidget {
child: Text(this.text,
overflow: TextOverflow.clip,
style: TextStyle(
color: new Color(0xFF40ACC9),
color: secondaryColor,
letterSpacing: 1.0,
fontSize: 20.0)),
),

6
lib/pages/ContactUs/LiveChat/livechat_page.dart
Unescape Escape View File

@ -23,9 +23,9 @@ class _LiveChatPageState extends State<LiveChatPage>
@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);
}

10
lib/pages/DrawerPages/family/my-family.dart
Unescape Escape View File

@ -72,17 +72,17 @@ class _MyFamily extends State<MyFamily> 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<MyFamily> 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),

8
lib/pages/MyAppointments/MyAppointments.dart
Unescape Escape View File

@ -60,14 +60,14 @@ class _MyAppointmentsState extends State<MyAppointments>
});
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();
}

4
lib/pages/ToDoList/ToDo.dart
Unescape Escape View File

@ -65,9 +65,9 @@ class _ToDoState extends State<ToDo> {
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);
}

8
lib/pages/insurance/insurance_approval_screen.dart
Unescape Escape View File

@ -26,14 +26,14 @@ class _InsuranceApprovalState extends State<InsuranceApproval> {
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<InsuranceViewModel>(
onModelReady: widget.appointmentNo != null
? (model) =>

4
lib/pages/insurance/insurance_card_screen.dart
Unescape Escape View File

@ -34,9 +34,9 @@ class _InsuranceCardState extends State<InsuranceCard> {
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<InsuranceViewModel>(
onModelReady: (model) => model.getInsurance(),

2
lib/pages/insurance/insurance_update_screen.dart
Unescape Escape View File

@ -32,7 +32,7 @@ class _InsuranceUpdateState extends State<InsuranceUpdate>
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() {

2
lib/pages/medical/allergies_page.dart
Unescape Escape View File

@ -11,7 +11,7 @@ class AllergiesPage extends StatelessWidget {
List<ImagesInfo> 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<AllergiesViewModel>(
onModelReady: (model) => model.getAllergies(),
builder: (_, model, w) => AppScaffold(

2
lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
Unescape Escape View File

@ -77,8 +77,6 @@ class _AskDoctorHomPageState extends State<AskDoctorHomPage>
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],

4
lib/pages/medical/balance/advance_payment_page.dart
Unescape Escape View File

@ -59,9 +59,9 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
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

2
lib/pages/medical/balance/my_balance_page.dart
Unescape Escape View File

@ -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<MyBalanceViewModel>(
onModelReady: (model) => model.getPatientAdvanceBalanceAmount(),
builder: (_, model, w) => AppScaffold(

6
lib/pages/medical/doctor/doctor_home_page.dart
Unescape Escape View File

@ -19,8 +19,8 @@ class DoctorHomePage extends StatelessWidget {
List<ImagesInfo> 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<MyDoctorViewModel>(
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),
),

1
lib/pages/medical/eye/EyeHomePage.dart
Unescape Escape View File

@ -75,7 +75,6 @@ class _EyeHomePageState extends State<EyeHomePage>
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),

4
lib/pages/medical/labs/labs_home_page.dart
Unescape Escape View File

@ -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<LabsViewModel>(
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),
),

1
lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart
Unescape Escape View File

@ -74,7 +74,6 @@ class _BloodPressureHomePageState extends State<BloodPressureHomePage>
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),

1
lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart
Unescape Escape View File

@ -75,7 +75,6 @@ class _BloodSugarHomePageState extends State<BloodSugarHomePage>
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),

4
lib/pages/medical/patient_sick_leave_page.dart
Unescape Escape View File

@ -23,8 +23,8 @@ class _PatientSickLeavePageState extends State<PatientSickLeavePage> {
@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();
}

7
lib/pages/medical/prescriptions/prescriptions_home_page.dart
Unescape Escape View File

@ -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<HomePrescriptionsPage>
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<HomePrescriptionsPage>
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),

2
lib/pages/medical/prescriptions/prescriptions_page.dart
Unescape Escape View File

@ -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);
},

6
lib/pages/medical/radiology/radiology_home_page.dart
Unescape Escape View File

@ -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<RadiologyViewModel>(
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);
},

13
lib/pages/medical/reports/report_home_page.dart
Unescape Escape View File

@ -42,19 +42,19 @@ class _HomeReportPageState extends State<HomeReportPage>
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<ReportsViewModel>(
onModelReady: (model) => model.getReports(), //model.getPrescriptions(),
builder: (_, model, widget) => AppScaffold(
@ -102,7 +102,6 @@ class _HomeReportPageState extends State<HomeReportPage>
controller: _tabController,
indicatorWeight: 5.0,
indicatorSize: TabBarIndicatorSize.label,
indicatorColor: Theme.of(context).primaryColor,
labelColor: Theme.of(context).primaryColor,
unselectedLabelColor: Colors.grey[800],
tabs: [

4
lib/pages/medical/vital_sign/vital_sign_details_screen.dart
Unescape Escape View File

@ -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<VitalSignViewModel>(
onModelReady: appointmentNo != null && projectID != null
? (model) => model.getPatientVitalSign(

1
lib/pages/vaccine/my_vaccines_screen.dart
Unescape Escape View File

@ -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();

3
lib/uitl/utils.dart
Unescape Escape View File

@ -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),

14
lib/widgets/bottom_navigation/bottom_navigation_item.dart
Unescape Escape View File

@ -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,
),

4
lib/widgets/buttons/floatingActionButton.dart
Unescape Escape View File

@ -87,8 +87,8 @@ class _FloatingButtonState extends State<FloatingButton>
]),
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,

7
lib/widgets/data_display/medical/medical_profile_item.dart
Unescape Escape View File

@ -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: <Widget>[
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(

4
lib/widgets/others/app_expandable_notifier.dart
Unescape Escape View File

@ -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<AppExpandableNotifier> {
height: 28.0,
width: 30.0,
decoration: new BoxDecoration(
color: Color(0xFF40ACC9),
color: secondaryColor,
shape: BoxShape.circle,
),
child: new Center(

Write Preview
Loading…
Cancel
Save