Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor-app-design

doctor-app-design
hussam al-habibeh 4 years ago
commit fca6990938

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

@ -12,6 +12,7 @@ import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart'; import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../../util/extenstions.dart'; import '../../../util/extenstions.dart';
@ -61,7 +62,7 @@ class PatientCard extends StatelessWidget {
decoration: Helpers.getCardBoxDecoration(), decoration: Helpers.getCardBoxDecoration(),
child: CardWithBgWidget( child: CardWithBgWidget(
padding: 0, padding: 0,
marginLeft: (!isMyPatient && isInpatient) ? 0 : 10, marginLeft: (!isMyPatient && isInpatient) ||isFromLiveCare ? 0 : 10,
marginSymmetric: isFromSearch ? 10 : 0.0, marginSymmetric: isFromSearch ? 10 : 0.0,
hasBorder: false, hasBorder: false,
bgColor: isFromLiveCare bgColor: isFromLiveCare
@ -317,6 +318,7 @@ class PatientCard extends StatelessWidget {
), ),
]), ]),
), ),
if(nationalityName.isNotEmpty)
Expanded( Expanded(
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
@ -466,11 +468,11 @@ class PatientCard extends StatelessWidget {
children: [ children: [
Container( Container(
padding: EdgeInsets.all(4), padding: EdgeInsets.all(4),
child: Image.asset( child: SvgPicture.asset(
'assets/images/livecare.png', 'assets/images/svgs/profile_screen/livecare.svg',
height: 25, height: 20,
width: 35, width: 20,
color: Colors.grey.shade700, // color: Colors.grey.shade700,
)), )),
], ],
) )
@ -480,15 +482,15 @@ class PatientCard extends StatelessWidget {
children: [ children: [
Container( Container(
padding: EdgeInsets.all(4), padding: EdgeInsets.all(4),
child: Image.asset( child: SvgPicture.asset(
patientInfo.appointmentType == patientInfo.appointmentType ==
'Regular' && 'Regular' &&
patientInfo.visitTypeId == 100 patientInfo.visitTypeId == 100
? 'assets/images/livecare.png' ? 'assets/images/svgs/profile_screen/livecare.svg'
: patientInfo.appointmentType == : patientInfo.appointmentType ==
'Walkin' 'Walkin'
? 'assets/images/walkin.png' ? 'assets/images/svgs/profile_screen/walkin.svg'
: 'assets/images/booked.png', : 'assets/images/svgs/profile_screen/booked.svg',
height: 25, height: 25,
width: 35, width: 35,
)), )),

@ -41,56 +41,61 @@ class _BottomNavBarState extends State<BottomNavBar> {
elevation: 4, elevation: 4,
shape: CircularNotchedRectangle(), shape: CircularNotchedRectangle(),
color: Colors.white, color: Colors.white,
child: Padding( child: Container(
padding: EdgeInsets.symmetric(horizontal: 18), decoration: BoxDecoration(
child: Row( border: Border.all(color: Color(0XFFEFEFEF), width: 1)
mainAxisSize: MainAxisSize.max, ),
mainAxisAlignment: MainAxisAlignment.spaceAround, child: Padding(
children: [ padding: EdgeInsets.symmetric(horizontal: 18),
BottomNavigationItem( child: Row(
icon: DoctorApp.home_1, mainAxisSize: MainAxisSize.max,
activeIcon: DoctorApp.home_active_1, mainAxisAlignment: MainAxisAlignment.spaceAround,
svgPath: "assets/images/svgs/bottom_nav/home-active.svg", children: [
changeIndex: _changeIndex, BottomNavigationItem(
index: widget.index, icon: DoctorApp.home_1,
currentIndex: 0, activeIcon: DoctorApp.home_active_1,
name: TranslationBase.of(context).home, svgPath: "assets/images/svgs/bottom_nav/home-active.svg",
dashboardViewModel: widget.dashboardViewModel, changeIndex: _changeIndex,
), index: widget.index,
BottomNavigationItem( currentIndex: 0,
icon: DoctorApp.schedule_1, name: TranslationBase.of(context).home,
activeIcon: DoctorApp.schedule_active_1, dashboardViewModel: widget.dashboardViewModel,
svgPath: "assets/images/svgs/bottom_nav/schedule-active.svg", ),
changeIndex: _changeIndex, BottomNavigationItem(
index: widget.index, icon: DoctorApp.schedule_1,
currentIndex: 1, activeIcon: DoctorApp.schedule_active_1,
name: TranslationBase.of(context).mySchedule, svgPath: "assets/images/svgs/bottom_nav/schedule-active.svg",
dashboardViewModel: widget.dashboardViewModel, changeIndex: _changeIndex,
index: widget.index,
currentIndex: 1,
name: TranslationBase.of(context).mySchedule,
dashboardViewModel: widget.dashboardViewModel,
), ),
BottomNavigationItem( BottomNavigationItem(
icon: DoctorApp.qr_reader, icon: DoctorApp.qr_reader,
activeIcon: DoctorApp.qr_reader_active_1, activeIcon: DoctorApp.qr_reader_active_1,
svgPath: "assets/images/svgs/bottom_nav/reader-active.svg", svgPath: "assets/images/svgs/bottom_nav/reader-active.svg",
changeIndex: _changeIndex, changeIndex: _changeIndex,
index: widget.index, index: widget.index,
currentIndex: 2, currentIndex: 2,
name: TranslationBase.of(context).qr, name: TranslationBase.of(context).qr,
dashboardViewModel: widget.dashboardViewModel, dashboardViewModel: widget.dashboardViewModel,
), ),
BottomNavigationItem( BottomNavigationItem(
icon: DoctorApp.dr_reply_1, icon: DoctorApp.dr_reply_1,
activeIcon: DoctorApp.dr_reply_active_1, activeIcon: DoctorApp.dr_reply_active_1,
svgPath: "assets/images/svgs/bottom_nav/reply-active.svg", svgPath: "assets/images/svgs/bottom_nav/reply-active.svg",
changeIndex: _changeIndex, changeIndex: _changeIndex,
index: widget.index, index: widget.index,
currentIndex: 3, currentIndex: 3,
name: TranslationBase.of(context).replay2, name: TranslationBase.of(context).replay2,
dashboardViewModel: widget.dashboardViewModel, dashboardViewModel: widget.dashboardViewModel,
), ),
], ],
),
), ),
), ),
); );

Loading…
Cancel
Save