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

merge-requests/925/head
hussam al-habibeh 4 years ago
commit 4c1ed7f931

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 749 B

After

Width:  |  Height:  |  Size: 749 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25.47" height="29.309" viewBox="0 0 25.47 29.309">
<path id="diagnose" d="M59.073,10.053a.6.6,0,0,1,.174.123L63.268,14.2a.6.6,0,0,1,.123.174H59.669a.6.6,0,0,1-.6-.6V10.053ZM55.566,20.885A6.3,6.3,0,0,1,60.6,30.972l1.51,1.51a.811.811,0,0,1,.976.128l4.371,4.371a.81.81,0,0,1,0,1.143l-.951.951a.81.81,0,0,1-1.143,0L60.992,34.7a.811.811,0,0,1-.128-.976l-1.51-1.51a6.3,6.3,0,1,1-3.788-11.332Zm0,1.749a4.55,4.55,0,1,0,4.55,4.55A4.55,4.55,0,0,0,55.566,22.634Zm5.91,14.239-1.327-1.327a1.993,1.993,0,0,1-.584-1.433l-.373-.373a7.487,7.487,0,1,1,2.93-2.93l.373.373a2,2,0,0,1,.948.227V15.562H59.669a1.789,1.789,0,0,1-1.787-1.787V10H42.818a.6.6,0,0,0-.6.6v25.68a.6.6,0,0,0,.6.6H61.476ZM49.529,13.8a.3.3,0,0,1,.3.3v1.67H51.5a.3.3,0,0,1,.3.3V18.09a.3.3,0,0,1-.3.3h-1.67v1.67a.3.3,0,0,1-.3.3H47.508a.3.3,0,0,1-.3-.3v-1.67H45.54a.3.3,0,0,1-.3-.3V16.069a.3.3,0,0,1,.3-.3h1.67V14.1a.3.3,0,0,1,.3-.3Z" transform="translate(-42.222 -10.001)" fill="#28323a" fill-rule="evenodd"/>
</svg>

After

Width:  |  Height:  |  Size: 1013 B

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="21.561" height="28.306" viewBox="0 0 21.561 28.306">
<g id="medical-report" transform="translate(-61)">
<path id="Path_4648" data-name="Path 4648" d="M325,12.236a.277.277,0,0,0,.276.276h6.32a3.033,3.033,0,0,0-.581-.759L325.684,6.71A3.047,3.047,0,0,0,325,6.222Z" transform="translate(-249.405 -5.878)" fill="#28323a"/>
<path id="Path_4649" data-name="Path 4649" d="M75.872,8.293a1.937,1.937,0,0,1-1.935-1.935V0h-9.9A3.044,3.044,0,0,0,61,3.041V25.265a3.044,3.044,0,0,0,3.041,3.041h15.48a3.044,3.044,0,0,0,3.041-3.041V8.293ZM70.122,5.8a.829.829,0,1,1,0,1.659H68.464V9.122a.829.829,0,1,1-1.659,0V7.464H65.146a.829.829,0,1,1,0-1.659H66.8V4.146a.829.829,0,1,1,1.659,0V5.8ZM65.533,18.8a.829.829,0,1,1,0-1.659H77.7a.829.829,0,0,1,0,1.659Zm4.85,3.594a.829.829,0,0,1-.829.829h-4.02a.829.829,0,1,1,0-1.659h4.02A.829.829,0,0,1,70.383,22.391ZM77.7,12.716a.829.829,0,0,1,0,1.659H65.533a.829.829,0,1,1,0-1.659Z" fill="#28323a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 985 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="21.098" height="29.309" viewBox="0 0 21.098 29.309">
<path id="google-sheets" d="M49.083,29.309a.645.645,0,0,0,.645-.645V8.8H42.307a1.954,1.954,0,0,1-1.951-1.952V0H29.275a.645.645,0,0,0-.645.645V28.664a.645.645,0,0,0,.645.645ZM32.109,12.566h14.3V24.039h-14.3Zm7.724,8.079h5.429v2.247H39.833Zm-6.576-3.537h5.429V19.5H33.257Zm0,3.537h5.429v2.247H33.257Zm6.576-6.931h5.429v2.247H39.833Zm0,3.394h5.429V19.5H39.833Zm-6.576-3.394h5.429v2.247H33.257ZM41.79,6.846V1.491l6.282,5.873H42.307A.518.518,0,0,1,41.79,6.846Z" transform="translate(-28.63)" fill="#28323a"/>
</svg>

After

Width:  |  Height:  |  Size: 613 B

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="28.196" height="28.306" viewBox="0 0 28.196 28.306">
<g id="file_1_" data-name="file (1)" transform="translate(-1)">
<path id="Path_4645" data-name="Path 4645" d="M411,8.782v5.043h5.043Z" transform="translate(-387.333 -8.296)" fill="#28323a"/>
<path id="Path_4646" data-name="Path 4646" d="M136.2,7.187a.829.829,0,0,1-.829-.829V0H123.488A2.491,2.491,0,0,0,121,2.488v9.271c.273-.025.55-.038.829-.038a9.107,9.107,0,0,1,7.032,3.317h9a.829.829,0,0,1,0,1.659h-7.909a9.053,9.053,0,0,1,.96,3.317h6.949a.829.829,0,0,1,0,1.659h-6.949a9.125,9.125,0,0,1-3.845,6.634h13.005a2.491,2.491,0,0,0,2.488-2.488V7.187Zm1.659,4.533H125.7a.829.829,0,1,1,0-1.659h12.163a.829.829,0,0,1,0,1.659Z" transform="translate(-113.366)" fill="#28323a"/>
<path id="Path_4647" data-name="Path 4647" d="M8.464,242a7.464,7.464,0,1,0,7.464,7.464A7.472,7.472,0,0,0,8.464,242Zm2.211,8.293H8.464a.829.829,0,0,1-.829-.829v-3.317a.829.829,0,0,1,1.659,0v2.488h1.382a.829.829,0,1,1,0,1.659Z" transform="translate(0 -228.621)" fill="#28323a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" width="21.425" height="28.306" viewBox="0 0 21.425 28.306">
<g id="medical-report_1_" data-name="medical-report (1)" transform="translate(-5.834)">
<path id="Path_4650" data-name="Path 4650" d="M24.639,0H8.455A2.624,2.624,0,0,0,5.834,2.621V25.685a2.624,2.624,0,0,0,2.621,2.621H24.639a2.623,2.623,0,0,0,2.62-2.621V2.621A2.623,2.623,0,0,0,24.639,0ZM9.195,4.748,10.826,1.94a.59.59,0,0,1,1.02.592L10.73,4.455H22.474l-.892-1.977a.589.589,0,1,1,1.074-.485L23.924,4.8a.589.589,0,0,1-.537.833H9.7a.591.591,0,0,1-.51-.886ZM24.08,17.225H19.771a.59.59,0,0,1-.556-.392l-.407-1.15-.984,7.347a.59.59,0,0,1-.568.511h-.017a.588.588,0,0,1-.578-.478L14.678,12.8l-1.3,4.359a.589.589,0,0,1-.564.422h-3.8a.59.59,0,1,1,0-1.179h3.361l1.863-6.244a.59.59,0,0,1,1.144.057l1.753,9.083.827-6.185a.589.589,0,0,1,.523-.508.6.6,0,0,1,.617.389l1.085,3.057h3.893a.59.59,0,1,1,0,1.179Z" transform="translate(0)" fill="#28323a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 955 B

@ -215,7 +215,6 @@
TargetAttributes = {
97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = 3A359E86ZF;
LastSwiftMigration = 1100;
};
};
@ -416,7 +415,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = 3A359E86ZF;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -551,7 +550,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = 3A359E86ZF;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -582,7 +581,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = 3A359E86ZF;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
LastUpgradeVersion = "1310"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -27,8 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
@ -38,8 +36,8 @@
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -61,8 +59,6 @@
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Profile"

@ -54,9 +54,9 @@ const Map<String, Map<String, String>> localizedValues = {
"referral": {"en": "Referral", "ar": "الإحالة"},
"inPatient": {"en": "In Patients", "ar": "مرضاي"},
"myInPatient": {"en": "My\n In Patients", "ar": "مرضاي\nالمنومين"},
"myInPatientTitle": {"en": "My InPatients", "ar": "مرضاي المنومين"},
"myInPatientTitle": {"en": "My Patients", "ar": "مرضاي المنومين"},
"inPatientLabel": {"en": "InPatients", "ar": "المريض المنوم"},
"inPatientAll": {"en": "All InPatients", "ar": "جميع المرضى المنومين"},
"inPatientAll": {"en": "All Patients", "ar": "جميع المرضى المنومين"},
"operations": {"en": "Operations", "ar": "عمليات"},
"patientServices": {"en": "Patient Services", "ar": "خدمات المرضى"},
"searchMedicineDashboard": {

@ -81,15 +81,6 @@ class _DoctorReplyScreenState extends State<DoctorReplyScreen>
preferredSize: Size.fromHeight(
MediaQuery.of(context).size.height * 0.070),
child: Container(
height: MediaQuery.of(context).size.height * 0.070,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: Theme.of(context).dividerColor,
width: 0.5), //width: 0.7
),
color: Colors.white),
child: Center(
child: TabBar(
isScrollable: false,
controller: _tabController,
@ -104,18 +95,22 @@ class _DoctorReplyScreenState extends State<DoctorReplyScreen>
tabWidget(
screenSize,
_activeTab == 0,
/// TODO Elham* Add Tran
"Not Replied",
isFirst: true, context: context
),
tabWidget(
screenSize,
_activeTab == 1,
TranslationBase.of(context).all,
isLast: true,
context: context
),
],
),
),
),
),
body: Column(
children: [
Expanded(
@ -140,44 +135,22 @@ class _DoctorReplyScreenState extends State<DoctorReplyScreen>
}
Widget tabWidget(Size screenSize, bool isActive, String title,
{int counter = -1}) {
{int counter = -1, bool isFirst = false,
bool isMiddle = false,
bool isLast = false,context}) {
return Center(
child: Container(
height: screenSize.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
isActive ? Color(0xFFD02127 /*B8382B*/) : Color(0xFFEAEAEA),
isActive ? Color(0xFFD02127) : Color(0xFFEAEAEA),
borderRadius: 4,
borderWidth: 0),
height: Helpers.getTabHeight(context),
decoration: Helpers.getBoxTabsBoxDecoration(isActive: isActive,isFirst: isFirst, isMiddle: isMiddle, isLast: isLast),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
AppText(
title,
fontSize: SizeConfig.textMultiplier * 1.5,
color: isActive ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
),
Helpers.getTabText(title: title, isActive: isActive),
if (counter != -1)
Container(
margin: EdgeInsets.all(4),
width: 15,
height: 15,
decoration: BoxDecoration(
color: isActive ? Colors.white : Color(0xFFD02127),
shape: BoxShape.circle,
),
child: Center(
child: FittedBox(
child: AppText(
"$counter",
fontSize: SizeConfig.textMultiplier * 1.5,
color: !isActive ? Colors.white : Color(0xFFD02127),
fontWeight: FontWeight.w700,
),
),
),
),
Helpers.getTabCounter(
isActive: isActive,
counter:counter
)
],
),
),

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
@ -10,7 +11,7 @@ class HomePageCard extends StatelessWidget {
Key key,
this.color,
this.opacity = 0.4,
this.margin, this.width})
this.margin, this.width, this.gradient})
: super(key: key);
final bool hasBorder;
final String imageName;
@ -20,6 +21,8 @@ class HomePageCard extends StatelessWidget {
final double opacity;
final double width;
final EdgeInsets margin;
final LinearGradient gradient;
@override
Widget build(BuildContext context) {
return InkWell(
@ -28,12 +31,13 @@ class HomePageCard extends StatelessWidget {
width: width,
margin: this.margin,
decoration: BoxDecoration(
color: !hasBorder
? color != null
? color
: HexColor('#050705').withOpacity(opacity)
: Colors.white,
borderRadius: BorderRadius.circular(17.0),
// color: !hasBorder
// ? color != null
// ? color
// : HexColor('#050705').withOpacity(opacity)
// : Colors.white,
gradient: gradient,
borderRadius: BorderRadius.circular(20.0),
border: hasBorder
? Border.all(width: 1.0, color: const Color(0xffcccccc))
: Border.all(width: 0.0, color: Colors.transparent),

@ -12,6 +12,7 @@ class HomePatientCard extends StatelessWidget {
final Color textColor;
final VoidCallback onTap;
final double iconSize;
final LinearGradient gradient;
HomePatientCard({
this.backgroundColor,
@ -21,7 +22,7 @@ class HomePatientCard extends StatelessWidget {
this.text,
this.textColor,
this.onTap,
this.iconSize = 30,
this.iconSize = 30, this.gradient,
});
@override
@ -31,6 +32,7 @@ class HomePatientCard extends StatelessWidget {
return HomePageCard(
color: backgroundColor,
width: width,
gradient: gradient,
margin: EdgeInsets.all(SizeConfig.widthMultiplier *1.121),
child: Container(
padding: EdgeInsets.all(8),
@ -94,6 +96,8 @@ class HomePatientCard extends StatelessWidget {
text,
color: textColor,
textAlign: TextAlign.start,
letterSpacing: -0.33,
fontWeight: FontWeight.w600,
fontSize:
SizeConfig.getTextMultiplierBasedOnWidth(width: width) *
(SizeConfig.isHeightVeryShort ? 11 : 10),

@ -319,24 +319,39 @@ class _HomeScreenState extends State<HomeScreen> {
DashboardViewModel model, projectsProvider) {
colorIndex = 0;
List<Color> backgroundColors = List(3);
backgroundColors[0] = AppGlobal.appRedColor;
backgroundColors[1] = Colors.grey[300];
backgroundColors[2] = Color(0xFF2B353E);
List<LinearGradient> backgroundColors = List(3);
backgroundColors[0] = LinearGradient(
begin: Alignment(-1.0, -2.0),
end: Alignment(1.0, 2.0),
colors: [
AppGlobal.appRedColor,Color(0xFFAD3B3B),
]);//AppGlobal.appRedColor;
backgroundColors[1] = LinearGradient(
begin: Alignment.center,
end: Alignment.center,
colors: [
Color(0xFFC9C9C9),Color(0xFFC9C9C9),
]);
backgroundColors[2] = LinearGradient(
begin: Alignment.center,
end: Alignment.center,
colors: [
Color(0xFF71787E),AppGlobal.appTextColor
]);
List<Color> backgroundIconColors = List(3);
backgroundIconColors[0] = Colors.white12;
backgroundIconColors[1] = Colors.white38;
backgroundIconColors[2] = Colors.white10;
List<Color> textColors = List(3);
textColors[0] = Colors.white;
textColors[1] = Colors.black;
textColors[1] = Color(0xFF353E47);
textColors[2] = Colors.white;
List<HomePatientCard> patientCards = List();
if (model.hasVirtualClinic) {
patientCards.add(HomePatientCard(
backgroundColor: backgroundColors[colorIndex],
gradient: backgroundColors[colorIndex],
backgroundIconColor: backgroundIconColors[colorIndex],
cardIcon: DoctorApp.livecare,
textColor: textColors[colorIndex],
@ -373,7 +388,7 @@ class _HomeScreenState extends State<HomeScreen> {
}
patientCards.add(HomePatientCard(
backgroundColor: backgroundColors[colorIndex],
gradient: backgroundColors[colorIndex],
backgroundIconColor: backgroundIconColors[colorIndex],
cardIcon: DoctorApp.inpatient,
textColor: textColors[colorIndex],
@ -393,7 +408,7 @@ class _HomeScreenState extends State<HomeScreen> {
changeColorIndex();
patientCards.add(HomePatientCard(
backgroundColor: backgroundColors[colorIndex],
gradient: backgroundColors[colorIndex],
backgroundIconColor: backgroundIconColors[colorIndex],
//TODO Elham* match the of the icon
cardIcon: DoctorApp.arrival_patients,
@ -411,7 +426,7 @@ class _HomeScreenState extends State<HomeScreen> {
changeColorIndex();
patientCards.add(HomePatientCard(
backgroundColor: backgroundColors[colorIndex],
gradient: backgroundColors[colorIndex],
backgroundIconColor: backgroundIconColors[colorIndex],
cardIcon: DoctorApp.arrival_patients,
textColor: textColors[colorIndex],
@ -438,7 +453,7 @@ class _HomeScreenState extends State<HomeScreen> {
changeColorIndex();
patientCards.add(HomePatientCard(
backgroundColor: backgroundColors[colorIndex],
gradient: backgroundColors[colorIndex],
backgroundIconColor: backgroundIconColors[colorIndex],
cardIcon: DoctorApp.referral_1,
textColor: textColors[colorIndex],
@ -456,7 +471,7 @@ class _HomeScreenState extends State<HomeScreen> {
changeColorIndex();
patientCards.add(HomePatientCard(
backgroundColor: backgroundColors[colorIndex],
gradient: backgroundColors[colorIndex],
backgroundIconColor: backgroundIconColors[colorIndex],
cardIcon: DoctorApp.search,
textColor: textColors[colorIndex],
@ -473,7 +488,7 @@ class _HomeScreenState extends State<HomeScreen> {
changeColorIndex();
patientCards.add(HomePatientCard(
backgroundColor: backgroundColors[colorIndex],
gradient: backgroundColors[colorIndex],
backgroundIconColor: backgroundIconColors[colorIndex],
cardIcon: DoctorApp.search_medicines,
textColor: textColors[colorIndex],

@ -61,7 +61,7 @@ class _EndCallScreenState extends State<EndCallScreen> {
Widget build(BuildContext context) {
final List<PatientProfileCardModel> cardsList = [
PatientProfileCardModel(TranslationBase.of(context).resume,
TranslationBase.of(context).theCall, '', 'patient/vital_signs.png',
TranslationBase.of(context).theCall, '', 'assets/images/svgs/profile_screen/vital signs.svg',
isInPatient: isInpatient,
color: AppGlobal.appGreenColor,
onTap: () async {
@ -122,7 +122,7 @@ class _EndCallScreenState extends State<EndCallScreen> {
TranslationBase.of(context).endLC,
TranslationBase.of(context).consultation,
'',
'patient/vital_signs.png',
'assets/images/svgs/profile_screen/vital signs.svg',
isInPatient: isInpatient,
color: Colors.red[800],
onTap: () {
@ -155,7 +155,7 @@ class _EndCallScreenState extends State<EndCallScreen> {
TranslationBase.of(context).sendLC,
TranslationBase.of(context).instruction,
"",
'patient/health_summary.png',
'assets/images/svgs/profile_screen/health summary.svg',
onTap: () {
Helpers.showConfirmationDialog(context,
"${TranslationBase.of(context).areYouSureYouWantTo} ${TranslationBase.of(context).sendLC} ${TranslationBase.of(context).instruction} ?",
@ -179,7 +179,7 @@ class _EndCallScreenState extends State<EndCallScreen> {
TranslationBase.of(context).transferTo,
TranslationBase.of(context).admin,
'',
'patient/health_summary.png', onTap: () {
'assets/images/svgs/profile_screen/health summary.svg', onTap: () {
Navigator.push(
context,
MaterialPageRoute(

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart';
@ -111,6 +112,7 @@ class _InPatientScreenState extends State<InPatientScreen>
Expanded(
child: Scaffold(
extendBodyBehindAppBar: false,
appBar: PreferredSize(
preferredSize: Size.fromHeight(
MediaQuery.of(context).size.height * 0.070),
@ -123,26 +125,28 @@ class _InPatientScreenState extends State<InPatientScreen>
width: 0.5), //width: 0.7
),
color: Colors.white),
child: Center(
child: Container(
margin: EdgeInsets.only(top: 9),
child: TabBar(
isScrollable: false,
controller: _tabController,
indicatorColor: Colors.transparent,
indicatorWeight: 1.0,
indicatorSize: TabBarIndicatorSize.tab,
labelColor: Theme.of(context).primaryColor,
indicatorColor: AppGlobal.appRedColor,
indicatorWeight: 0.001,
indicator:BoxDecoration(),
// indicatorSize: TabBarIndicatorSize.tab,
// labelColor: Theme.of(context).primaryColor,
labelPadding: EdgeInsets.only(
top: 0, left: 0, right: 0, bottom: 0),
unselectedLabelColor: Colors.grey[800],
// unselectedLabelColor: Colors.grey[800],
tabs: [
tabWidget(screenSize, _activeTab == 0,
TranslationBase.of(context).inPatientAll,
counter: model.inPatientList.length),
counter: model.inPatientList.length, isFirst: true),
tabWidget(screenSize, _activeTab == 1,
TranslationBase.of(context).myInPatientTitle,
counter: model.myIinPatientList.length),
counter: model.myIinPatientList.length, isMiddle: true),
tabWidget(screenSize, _activeTab == 2,
TranslationBase.of(context).discharged),
TranslationBase.of(context).discharged, isLast:true),
],
),
),
@ -192,44 +196,20 @@ class _InPatientScreenState extends State<InPatientScreen>
}
Widget tabWidget(Size screenSize, bool isActive, String title,
{int counter = -1}) {
{int counter = -1,
bool isFirst = false,
bool isMiddle = false,
bool isLast = false,}) {
return Center(
child: Container(
height: screenSize.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
isActive ? Color(0xFFD02127 /*B8382B*/) : Color(0xFFEAEAEA),
isActive ? Color(0xFFD02127) : Color(0xFFEAEAEA),
borderRadius: 4,
borderWidth: 0),
height: Helpers.getTabHeight(context),
decoration:Helpers.getBoxTabsBoxDecoration(isActive: isActive,isFirst: isFirst, isMiddle: isMiddle, isLast: isLast),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
AppText(
title,
fontSize: SizeConfig.textMultiplier * 1.5,
color: isActive ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
),
Helpers.getTabText(title:title, isActive:isActive),
if (counter != -1)
Container(
margin: EdgeInsets.all(4),
width: 15,
height: 15,
decoration: BoxDecoration(
color: isActive ? Colors.white : Color(0xFFD02127),
shape: BoxShape.circle,
),
child: Center(
child: FittedBox(
child: AppText(
"$counter",
fontSize: SizeConfig.textMultiplier * 1.5,
color: !isActive ? Colors.white : Color(0xFFD02127),
fontWeight: FontWeight.w700,
),
),
),
),
Helpers.getTabCounter(isActive:isActive,counter:counter)
],
),
),

@ -11,6 +11,7 @@ import 'package:doctor_app_flutter/models/patient/patient_model.dart';
import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/patient_card/PatientCard.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
@ -105,7 +106,7 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
children: [
Container(
// color: Colors.red,
height: screenSize.height * 0.070,
height: Helpers.getTabHeight(context),
decoration: TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff), Color(0xFFCCCCCC),
borderRadius: 4, borderWidth: 0),
@ -143,52 +144,24 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
child: Center(
child: Container(
height: screenSize.height * 0.070,
decoration:
TextFieldsUtils.containerBorderDecoration(
_isActive
? Color(0xFFD02127 /*B8382B*/)
: Color(0xFFEAEAEA),
_isActive
? Color(0xFFD02127)
: Color(0xFFEAEAEA),
borderRadius: 4,
borderWidth: 0),
decoration: Helpers.getBoxTabsBoxDecoration(
isActive: _isActive,
isFirst: _times.indexOf(item) == 0,
isLast:
_times.indexOf(item) == _times.length - 1,
isMiddle: _times.indexOf(item) != 0 && _times.indexOf(item) != _times.length - 1
),
child: Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
AppText(
item,
fontSize: SizeConfig.textMultiplier * 1.8,
color: _isActive
? Colors.white
: Color(0xFF2B353E),
fontWeight: FontWeight.w700,
),
Helpers.getTabText(title: item, isActive: _isActive),
_isActive &&
_activeLocation != 0 &&
model.state == ViewState.Idle
? Container(
padding: EdgeInsets.all(2),
margin: EdgeInsets.symmetric(
horizontal: 5),
decoration: new BoxDecoration(
color: Colors.white,
borderRadius:
BorderRadius.circular(50),
),
constraints: BoxConstraints(
minWidth: 20,
minHeight: 20,
),
child: new Text(
model.filterData.length.toString(),
style: new TextStyle(
color: Colors.red,
fontSize: 10),
textAlign: TextAlign.center,
),
)
? Helpers.getTabCounter(isActive:_isActive,counter: model.filterData.length)
: Container(),
],
),
@ -245,7 +218,6 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
},
),
),
Expanded(
child: Container(
child: model.filterData.isEmpty
@ -267,7 +239,8 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
.patientStatusType ==
43))
return Padding(
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 0),
padding: EdgeInsets.symmetric(
horizontal: 8, vertical: 0),
child: PatientCard(
patientInfo: model.filterData[index],
patientType: patientType,

@ -22,6 +22,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:quiver/async.dart';
@ -251,8 +252,8 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
hPadding: 20,
fontWeight: FontWeight.normal,
fontSize: 1.6,
icon: Image.asset(
"assets/images/create-episod.png",
icon: SvgPicture.asset(
"assets/images/svgs/profile_screen/create episode.svg",
color: Colors.white,
height: 30,
),
@ -283,8 +284,8 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
hPadding: 20,
fontWeight: FontWeight.normal,
fontSize: 1.6,
icon: Image.asset(
"assets/images/modilfy-episode.png",
icon: SvgPicture.asset(
"assets/images/svgs/profile_screen/modify episode.svg",
color: Colors.white,
height: 30,
),

@ -39,70 +39,70 @@ class ProfileGridForInPatient extends StatelessWidget {
TranslationBase.of(context).vital,
TranslationBase.of(context).signs,
VITAL_SIGN_DETAILS,
'patient/vital_signs.png',
'assets/images/svgs/profile_screen/vital signs.svg',
isInPatient: isInpatient),
PatientProfileCardModel(
TranslationBase.of(context).lab,
TranslationBase.of(context).result,
LAB_RESULT,
'patient/lab_results.png',
'assets/images/svgs/profile_screen/lab results.svg',
isInPatient: isInpatient),
PatientProfileCardModel(
TranslationBase.of(context).lab,
TranslationBase.of(context).special,
ALL_SPECIAL_LAB_RESULT,
'patient/lab_results.png',
'assets/images/svgs/profile_screen/lab results.svg',
isInPatient: isInpatient),
PatientProfileCardModel(
TranslationBase.of(context).radiology,
TranslationBase.of(context).result,
RADIOLOGY_PATIENT,
'patient/health_summary.png',
'assets/images/svgs/profile_screen/Radiology.svg',
isInPatient: isInpatient),
PatientProfileCardModel(
TranslationBase.of(context).patient,
TranslationBase.of(context).prescription,
ORDER_PRESCRIPTION_NEW,
'patient/order_prescription.png',
'assets/images/svgs/profile_screen/order prescription.svg',
isInPatient: isInpatient),
PatientProfileCardModel(
TranslationBase.of(context).progress,
TranslationBase.of(context).note,
PROGRESS_NOTE,
'patient/Progress_notes.png',
'assets/images/svgs/profile_screen/Progress notes.svg',
isInPatient: isInpatient,
isDischargedPatient: isDischargedPatient),
PatientProfileCardModel(
TranslationBase.of(context).order,
TranslationBase.of(context).sheet,
ORDER_NOTE,
'patient/Progress_notes.png',
'assets/images/svgs/profile_screen/order sheets.svg',
isInPatient: isInpatient,
isDischargedPatient: isDischargedPatient),
PatientProfileCardModel(
TranslationBase.of(context).orders,
TranslationBase.of(context).procedures,
ORDER_PROCEDURE,
'patient/Order_Procedures.png',
'assets/images/svgs/profile_screen/Order Procedures.svg',
isInPatient: isInpatient),
PatientProfileCardModel(
TranslationBase.of(context).health,
TranslationBase.of(context).summary,
HEALTH_SUMMARY,
'patient/health_summary.png',
'assets/images/svgs/profile_screen/health summary.svg',
isInPatient: isInpatient),
PatientProfileCardModel(
TranslationBase.of(context).medical,
TranslationBase.of(context).report,
PATIENT_MEDICAL_REPORT,
'patient/health_summary.png',
'assets/images/svgs/profile_screen/medical report.svg',
isInPatient: isInpatient,
isDisable: false),
PatientProfileCardModel(
TranslationBase.of(context).referral,
TranslationBase.of(context).patient,
REFER_IN_PATIENT_TO_DOCTOR,
'patient/refer_patient.png',
'assets/images/svgs/profile_screen/refer patient.svg',
isInPatient: isInpatient,
isDisable: isDischargedPatient || isFromSearch,
),
@ -110,62 +110,62 @@ class ProfileGridForInPatient extends StatelessWidget {
TranslationBase.of(context).insurance,
TranslationBase.of(context).approvals,
PATIENT_INSURANCE_APPROVALS_NEW,
'patient/vital_signs.png',
'assets/images/svgs/profile_screen/insurance approval.svg',
isInPatient: isInpatient),
PatientProfileCardModel(
TranslationBase.of(context).discharge,
TranslationBase.of(context).report,
DISCHARGE_SUMMARY,
'patient/patient_sick_leave.png',
'assets/images/svgs/profile_screen/discharge summary.svg',
isInPatient: isInpatient,
),
PatientProfileCardModel(
TranslationBase.of(context).patientSick,
TranslationBase.of(context).leave,
ADD_SICKLEAVE,
'patient/patient_sick_leave.png',
'assets/images/svgs/profile_screen/patient sick leave.svg',
isInPatient: isInpatient,
),
PatientProfileCardModel(
TranslationBase.of(context).operation,
TranslationBase.of(context).report,
GET_OPERATION_REPORT,
'patient/patient_sick_leave.png',
'assets/images/svgs/profile_screen/operating report.svg',
isInPatient: isInpatient,
),
PatientProfileCardModel(
TranslationBase.of(context).pending,
TranslationBase.of(context).orders,
PENDING_ORDERS,
'patient/patient_sick_leave.png',
'assets/images/svgs/profile_screen/pending orders.svg',
isInPatient: isInpatient,
),
PatientProfileCardModel(
TranslationBase.of(context).admission,
TranslationBase.of(context).orders,
ADMISSION_ORDERS,
'patient/Progress_notes.png',
'assets/images/svgs/profile_screen/admission req.svg',
isInPatient: isInpatient,
),
PatientProfileCardModel(
"Nursing",
TranslationBase.of(context).progressNote,
NURSING_PROGRESS_NOTE,
'patient/Progress_notes.png',
'assets/images/svgs/profile_screen/Progress notes.svg',
isInPatient: isInpatient,
),
PatientProfileCardModel(
TranslationBase.of(context).diagnosis,
"",
DIAGNOSIS_FOR_IN_PATIENT,
'patient/patient_sick_leave.png',
'assets/images/svgs/profile_screen/diagnosis.svg',
isInPatient: isInpatient,
),
PatientProfileCardModel(
TranslationBase.of(context).diabetic,
TranslationBase.of(context).chart,
DIABETIC_CHART_VALUES,
'patient/patient_sick_leave.png',
'assets/images/svgs/profile_screen/diabetic chart.svg',
isInPatient: isInpatient,
),
];
@ -179,7 +179,7 @@ class ProfileGridForInPatient extends StatelessWidget {
// if you want IOS bouncing effect, otherwise remove this line
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisSpacing: 10,
mainAxisSpacing: 10,
mainAxisSpacing: 8,
crossAxisCount: 3,
),
//change the number as you want

@ -34,37 +34,37 @@ class ProfileGridForOther extends StatelessWidget {
Widget build(BuildContext context) {
final List<PatientProfileCardModel> cardsList = [
PatientProfileCardModel(TranslationBase.of(context).vital, TranslationBase.of(context).signs, VITAL_SIGN_DETAILS,
'patient/vital_signs.png',
'assets/images/svgs/profile_screen/vital signs.svg',
isInPatient: isInpatient),
PatientProfileCardModel(
TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'patient/lab_results.png',
TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).special,
ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png',
ALL_SPECIAL_LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service,
RADIOLOGY_PATIENT, 'patient/health_summary.png',
RADIOLOGY_PATIENT, 'assets/images/svgs/profile_screen/health summary.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).prescription,
ORDER_PRESCRIPTION_NEW, 'patient/order_prescription.png',
ORDER_PRESCRIPTION_NEW, 'assets/images/svgs/profile_screen/order prescription.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).health, TranslationBase.of(context).summary, HEALTH_SUMMARY,
'patient/health_summary.png',
'assets/images/svgs/profile_screen/health summary.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).patient, "ECG", PATIENT_ECG, 'patient/patient_sick_leave.png',
PatientProfileCardModel(TranslationBase.of(context).patient, "ECG", PATIENT_ECG, 'assets/images/svgs/profile_screen/ECG.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).procedures,
ORDER_PROCEDURE, 'patient/Order_Procedures.png',
ORDER_PROCEDURE, 'assets/images/svgs/profile_screen/Order Procedures.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).insurance, TranslationBase.of(context).service,
PATIENT_INSURANCE_APPROVALS_NEW, 'patient/vital_signs.png',
PATIENT_INSURANCE_APPROVALS_NEW, 'assets/images/svgs/profile_screen/insurance approval.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).patientSick, TranslationBase.of(context).leave, ADD_SICKLEAVE,
'patient/patient_sick_leave.png',
'assets/images/svgs/profile_screen/patient sick leave.svg',
isInPatient: isInpatient),
if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0))
PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).ucaf,
PATIENT_UCAF_REQUEST, 'patient/ucaf.png',
PATIENT_UCAF_REQUEST, 'assets/images/svgs/profile_screen/UCAF.svg',
isInPatient: isInpatient,
isDisable: isFromLiveCare
? patient.appointmentNo == null
@ -74,7 +74,7 @@ class ProfileGridForOther extends StatelessWidget {
TranslationBase.of(context).referral,
TranslationBase.of(context).patient,
REFER_PATIENT_TO_DOCTOR,
'patient/refer_patient.png',
'assets/images/svgs/profile_screen/refer patient.svg',
isInPatient: isInpatient,
isDisable: isFromLiveCare
? patient.appointmentNo == null
@ -82,7 +82,7 @@ class ProfileGridForOther extends StatelessWidget {
),
if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0))
PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request,
PATIENT_ADMISSION_REQUEST, 'patient/admission_req.png',
PATIENT_ADMISSION_REQUEST, 'assets/images/svgs/profile_screen/admission req.svg',
isInPatient: isInpatient,
isDisable: isFromLiveCare
? patient.appointmentNo == null
@ -96,8 +96,8 @@ class ProfileGridForOther extends StatelessWidget {
child: StaggeredGridView.countBuilder(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
crossAxisSpacing: 10,
mainAxisSpacing: 10,
crossAxisSpacing: 8,
mainAxisSpacing: 8,
crossAxisCount: 3,
itemCount: cardsList.length,
staggeredTileBuilder: (int index) => StaggeredTile.fit(1),

@ -24,45 +24,45 @@ class ProfileGridForSearch extends StatelessWidget {
Widget build(BuildContext context) {
final List<PatientProfileCardModel> cardsList = [
PatientProfileCardModel(TranslationBase.of(context).vital, TranslationBase.of(context).signs, VITAL_SIGN_DETAILS,
'patient/vital_signs.png',
'assets/images/svgs/profile_screen/vital signs.svg',
isInPatient: isInpatient),
PatientProfileCardModel(
TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'patient/lab_results.png',
TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).special,
ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png',
ALL_SPECIAL_LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service,
RADIOLOGY_PATIENT, 'patient/health_summary.png',
RADIOLOGY_PATIENT, 'assets/images/svgs/profile_screen/health summary.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).prescription,
ORDER_PRESCRIPTION_NEW, 'patient/order_prescription.png',
ORDER_PRESCRIPTION_NEW, 'assets/images/svgs/profile_screen/order prescription.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).health, TranslationBase.of(context).summary, HEALTH_SUMMARY,
'patient/health_summary.png',
'assets/images/svgs/profile_screen/health summary.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).patient, "ECG", PATIENT_ECG, 'patient/patient_sick_leave.png',
PatientProfileCardModel(TranslationBase.of(context).patient, "ECG", PATIENT_ECG, 'assets/images/svgs/profile_screen/ECG.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).procedures,
ORDER_PROCEDURE, 'patient/Order_Procedures.png',
ORDER_PROCEDURE, 'assets/images/svgs/profile_screen/Order Procedures.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).insurance, TranslationBase.of(context).service,
PATIENT_INSURANCE_APPROVALS_NEW, 'patient/vital_signs.png',
PATIENT_INSURANCE_APPROVALS_NEW, 'assets/images/svgs/profile_screen/vital signs.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).patientSick, TranslationBase.of(context).leave, ADD_SICKLEAVE,
'patient/patient_sick_leave.png',
'assets/images/svgs/profile_screen/patient sick leave.svg',
isInPatient: isInpatient),
if (patient.appointmentNo != null && patient.appointmentNo != 0)
PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).ucaf,
PATIENT_UCAF_REQUEST, 'patient/ucaf.png',
PATIENT_UCAF_REQUEST, 'assets/images/svgs/profile_screen/UCAF.svg',
isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false),
if (patient.appointmentNo != null && patient.appointmentNo != 0)
PatientProfileCardModel(TranslationBase.of(context).referral, TranslationBase.of(context).patient,
REFER_PATIENT_TO_DOCTOR, 'patient/refer_patient.png',
REFER_PATIENT_TO_DOCTOR, 'assets/images/svgs/profile_screen/refer patient.svg',
isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false),
if (patient.appointmentNo != null && patient.appointmentNo != 0)
PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request,
PATIENT_ADMISSION_REQUEST, 'patient/admission_req.png',
PATIENT_ADMISSION_REQUEST, 'assets/images/svgs/profile_screen/admission req.svg',
isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false),
];
@ -73,8 +73,8 @@ class ProfileGridForSearch extends StatelessWidget {
child: StaggeredGridView.countBuilder(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
crossAxisSpacing: 10,
mainAxisSpacing: 10,
crossAxisSpacing: 8,
mainAxisSpacing: 8,
crossAxisCount: 3,
itemCount: cardsList.length,
staggeredTileBuilder: (int index) => StaggeredTile.fit(1),

@ -37,6 +37,7 @@ class _MyReferralInPatientScreenState extends State<MyReferralInPatientScreen> {
children: [
Container(
margin: EdgeInsets.only(top: 70),
child: Container(
child: PatientTypeRadioWidget(
(patientType) async {
setState(() {
@ -52,6 +53,7 @@ class _MyReferralInPatientScreenState extends State<MyReferralInPatientScreen> {
},
),
),
),
model.myReferralPatients.isEmpty
? Center(
child: Column(
@ -73,6 +75,7 @@ class _MyReferralInPatientScreenState extends State<MyReferralInPatientScreen> {
)
: Expanded(
child: SingleChildScrollView(
child: Container(
child: Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -163,6 +166,7 @@ class _MyReferralInPatientScreenState extends State<MyReferralInPatientScreen> {
),
),
),
),
],
),
),

@ -3,6 +3,7 @@ import 'dart:ui';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart';
import 'package:doctor_app_flutter/screens/patients/profile/referral/referred-patient-screen.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -45,20 +46,21 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
@override
Widget build(BuildContext context) {
return AppScaffold(
isShowAppBar: true,
appBar: PatientSearchHeader(
title: TranslationBase.of(context).patientsreferral,
),
body: Column(
children: <Widget>[
Container(
//height: MediaQuery.of(context).size.height * 0.050,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: Theme.of(context).dividerColor,
width: 1), //width: 0.7
),
color: Colors.white),
appBarTitle: TranslationBase.of(context).patientsreferral,
body: Scaffold(
extendBodyBehindAppBar: true,
// backgroundColor: Colors.white,
appBar: PreferredSize(
preferredSize:
Size.fromHeight(MediaQuery.of(context).size.height * 0.070),
child: Center(
child: Container(
height: Helpers.getTabHeight(context),
child: Center(
child: TabBar(
isScrollable: false,
controller: _tabController,
@ -71,83 +73,38 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
unselectedLabelColor: Colors.grey[800],
tabs: [
Container(
width: MediaQuery.of(context).size.width * 0.33,
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff), Color(0xFFCCCCCC),
borderRadius: 4, borderWidth: 0),
decoration: Helpers.getBoxTabsBoxDecoration(
isActive: index == 0, isFirst: true),
child: Center(
child: Container(
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
index == 0 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
index == 0 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
borderRadius: 4,
borderWidth: 0),
child: Center(
child: AppText(
TranslationBase.of(context).myReferredPatient,
fontSize: SizeConfig.textMultiplier * 1.8,
color: index == 0 ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
),
),
),
child: Helpers.getTabText(title:TranslationBase.of(context).myReferredPatient, isActive:index == 0 )
),
),
Container(
width: MediaQuery.of(context).size.width * 0.34,
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff), Color(0xFFCCCCCC),
borderRadius: 4, borderWidth: 0),
child: Center(
Center(
child: Container(
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
index == 1 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
index == 1 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
borderRadius: 4,
borderWidth: 0),
decoration:Helpers.getBoxTabsBoxDecoration(
isActive: index == 1, isMiddle: true),
child: Center(
child: AppText(
TranslationBase.of(context).referral,
fontSize: SizeConfig.textMultiplier * 1.8,
color: index == 1 ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
),
child:Helpers.getTabText(title:TranslationBase.of(context).referral, isActive:index == 1 )
),
),
),
),
Container(
width: MediaQuery.of(context).size.width * 0.33,
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff), Color(0xFFCCCCCC),
borderRadius: 4, borderWidth: 0),
child: Center(
Center(
child: Container(
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
index == 2 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
index == 2 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
borderRadius: 4,
borderWidth: 0),
decoration:Helpers.getBoxTabsBoxDecoration(
isActive: index == 2, isLast: true),
child: Center(
child: AppText(
TranslationBase.of(context).discharged,
fontSize: SizeConfig.textMultiplier * 1.8,
color: index == 2 ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
child: Helpers.getTabText(title:TranslationBase.of(context).discharged, isActive:index == 2 ),
),
),
),
],
),
),
),
],
),
),
body: Column(
children: <Widget>[
Expanded(
child: TabBarView(
physics: BouncingScrollPhysics(),
@ -162,6 +119,6 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
)
],
),
);
));
}
}

@ -188,6 +188,7 @@ class Helpers {
static clearSharedPref() async {
await sharedPref.clear();
}
static getCardBoxDecoration() {
return BoxDecoration(
borderRadius: BorderRadius.circular(10),
@ -328,5 +329,64 @@ class Helpers {
return kpi;
}
static getBoxTabsBoxDecoration(
{
bool isFirst = false,
bool isMiddle = false,
bool isLast = false,
bool isActive = false,
double radius = 6.0
}) {
return BoxDecoration(
color: isActive ? AppGlobal.appRedColor : Color(0xFFEAEAEA),
shape: BoxShape.rectangle,
borderRadius: BorderRadius.only(
topRight: Radius.circular(isActive?isFirst || isMiddle?radius:0:0),
bottomRight: Radius.circular(isActive?isFirst || isMiddle?radius:0:0),
topLeft: Radius.circular(isActive?isLast|| isMiddle?radius:0:0),
bottomLeft: Radius.circular(isActive?isLast || isMiddle?radius:0:0)
),
);
}
static getTabText({String title, bool isActive = false,}){
return AppText(
title,
fontSize: SizeConfig.textMultiplier * 1.8,
color: isActive ? Colors.white : AppGlobal.appTextColor,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
);
}
static getTabHeight(BuildContext context){
final screenSize = MediaQuery.of(context).size;
return screenSize.height * 0.07;
}
static getTabCounter({bool isActive: false,int counter}){
return Container(
margin: EdgeInsets.all(4),
width: 15,
height: 15,
decoration: BoxDecoration(
color: isActive ? Colors.white : AppGlobal.appRedColor,
shape: BoxShape.circle,
),
child: Center(
child: FittedBox(
child: AppText(
"$counter",
fontSize: SizeConfig.textMultiplier * 1.5,
color: !isActive ? Colors.white : AppGlobal.appRedColor,
fontWeight: FontWeight.w700,
),
),
),
);
}
}

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';
@ -118,8 +119,9 @@ class MethodTypeCard extends StatelessWidget {
AppText(
label,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* (SizeConfig.isHeightVeryShort?3:3.7),
color: Color(0xFF2B353E),
fontWeight: FontWeight.w700,
color: AppGlobal.appTextColor,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
)
],
),

@ -37,7 +37,9 @@ class GetActivityCard extends StatelessWidget {
AppText(
value.kPIParameter,
textOverflow: TextOverflow.clip,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightVeryShort?8: SizeConfig.isHeightShort?8: 9),
fontHeight: 1.4,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightVeryShort?8: SizeConfig.isHeightShort?8: 9.3),
color: AppGlobal.appTextColor,
textAlign: TextAlign.start,
fontWeight: FontWeight.w600,

@ -126,7 +126,7 @@ class GetOutPatientStack extends StatelessWidget {
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5,
textAlign: TextAlign.center,
color: Color(0xFF2B353E),
fontWeight: FontWeight.w700,
fontWeight: FontWeight.w500,
letterSpacing: -0.3,
),
AppText(

@ -55,7 +55,7 @@ class PatientReferralItemWidget extends StatelessWidget {
ProjectViewModel projectViewModel = Provider.of(context);
return Container(
margin: EdgeInsets.only(left: 16.0, right: 16.0, top: 8.0),
margin: EdgeInsets.only(left: 16.0, right: 16.0, top: 0.0),
child: Column(
children: [
Container(

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
@ -5,6 +6,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:provider/provider.dart';
// ignore: must_be_immutable
@ -59,7 +61,7 @@ class PatientProfileButton extends StatelessWidget {
return Container(
margin: EdgeInsets.symmetric(horizontal: 0.0),
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 16),
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 0),
child: InkWell(
onTap: isDisable
? null
@ -68,7 +70,9 @@ class PatientProfileButton extends StatelessWidget {
: () {
navigator(context, this.route);
},
child: Column(children: <Widget>[
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Container(
padding: EdgeInsets.fromLTRB(8, 0, 8, 8),
child: Row(
@ -81,11 +85,10 @@ class PatientProfileButton extends StatelessWidget {
size: 30,
color: color ?? Color(0xFF333C45),
)
: new Image.asset(
url + icon,
: new SvgPicture.asset(
icon,
width: 30,
height: 30,
fit: BoxFit.contain,
),
)
],
@ -98,17 +101,19 @@ class PatientProfileButton extends StatelessWidget {
children: [
AppText(
!projectsProvider.isArabic ? this.nameLine1 : nameLine2,
color: color ?? Color(0xFF2B353E),
color: color ?? AppGlobal.appTextColor,
letterSpacing: -0.33,
fontWeight: FontWeight.w600,
textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 1.35,
fontSize: SizeConfig.textMultiplier * 1.30,
),
AppText(
!projectsProvider.isArabic ? this.nameLine2 : nameLine1,
color: color ?? Color(0xFF2B353E),
fontWeight: FontWeight.w600,
textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 1.35,
fontHeight: 1.4,
fontSize: SizeConfig.textMultiplier * 1.30,
),
if (isLoading) DrAppCircularProgressIndeicator()
],
@ -119,9 +124,9 @@ class PatientProfileButton extends StatelessWidget {
decoration: BoxDecoration(
// border: Border.all(),
color: isDisable ? Colors.grey.withOpacity(0.4) : Colors.white,
borderRadius: BorderRadius.all(Radius.circular(10)),
borderRadius: BorderRadius.all(Radius.circular(15)),
border: Border.fromBorderSide(BorderSide(
color: color ?? Color(0xffBBBBBB),
color: color ?? Color(0xFFEFEFEF),
width: 1,
)),
),

@ -40,7 +40,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine1: TranslationBase.of(context).vital,
nameLine2: TranslationBase.of(context).signs,
route: VITAL_SIGN_DETAILS,
icon: 'patient/vital_signs.png'),
icon: 'assets/images/svgs/profile_screen/vital signs.svg'),
// if (selectedPatientType != 7)
PatientProfileButton(
key: key,
@ -50,7 +50,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: HEALTH_SUMMARY,
nameLine1: "Health", //TranslationBase.of(context).medicalReport,
nameLine2: "Summary", //TranslationBase.of(context).summaryReport,
icon: 'patient/health_summary.png'),
icon: 'assets/images/svgs/profile_screen/health summary.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -59,7 +59,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: LAB_RESULT,
nameLine1: TranslationBase.of(context).lab,
nameLine2: TranslationBase.of(context).result,
icon: 'patient/lab_results.png'),
icon: 'assets/images/svgs/profile_screen/lab results.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -68,7 +68,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: ALL_SPECIAL_LAB_RESULT,
nameLine1: TranslationBase.of(context).lab,
nameLine2: TranslationBase.of(context).special,
icon: 'patient/lab_results.png'),
icon: 'assets/images/svgs/profile_screen/lab results.svg'),
// if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
@ -79,7 +79,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: RADIOLOGY_PATIENT,
nameLine1: TranslationBase.of(context).radiology,
nameLine2: TranslationBase.of(context).service,
icon: 'patient/health_summary.png'),
icon: 'assets/images/svgs/profile_screen/health summary.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -88,7 +88,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: PATIENT_ECG,
nameLine1: TranslationBase.of(context).patient,
nameLine2: "ECG",
icon: 'patient/patient_sick_leave.png'),
icon: 'assets/images/svgs/profile_screen/ECG.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -97,7 +97,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: ORDER_PRESCRIPTION_NEW,
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).prescription,
icon: 'patient/order_prescription.png'),
icon: 'assets/images/svgs/profile_screen/order prescription.svg'),
// if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
@ -107,7 +107,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: ORDER_PROCEDURE,
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).procedures,
icon: 'patient/Order_Procedures.png'),
icon: 'assets/images/svgs/profile_screen/Order Procedures.svg'),
//if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
@ -117,7 +117,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: PATIENT_INSURANCE_APPROVALS_NEW,
nameLine1: TranslationBase.of(context).insurance,
nameLine2: TranslationBase.of(context).service,
icon: 'patient/vital_signs.png'),
icon: 'assets/images/svgs/profile_screen/insurance approval.svg'),
// if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
@ -127,7 +127,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: ADD_SICKLEAVE,
nameLine1: TranslationBase.of(context).patientSick,
nameLine2: TranslationBase.of(context).leave,
icon: 'patient/patient_sick_leave.png'),
icon: 'assets/images/svgs/profile_screen/patient sick leave.svg'),
if (patient.appointmentNo != null && patient.appointmentNo != 0)
PatientProfileButton(
key: key,
@ -170,7 +170,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: PROGRESS_NOTE,
nameLine1: TranslationBase.of(context).progress,
nameLine2: TranslationBase.of(context).note,
icon: 'patient/Progress_notes.png'),
icon: 'assets/images/svgs/profile_screen/Progress notes.svg'),
if (isInpatient)
PatientProfileButton(
key: key,
@ -180,7 +180,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: ORDER_NOTE,
nameLine1: "Order", //"Text",
nameLine2: "Sheet",
icon: 'patient/Progress_notes.png'),
icon: 'assets/images/svgs/profile_screen/Progress notes.svg'),
],
),
);

@ -49,7 +49,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
nameLine2: TranslationBase.of(context).signs,
route: VITAL_SIGN_DETAILS,
isInPatient: true,
icon: 'patient/vital_signs.png'),
icon: 'assets/images/svgs/profile_screen/vital signs.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -59,7 +59,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
isInPatient: true,
nameLine1: TranslationBase.of(context).lab,
nameLine2: TranslationBase.of(context).result,
icon: 'patient/lab_results.png'),
icon: 'assets/images/svgs/profile_screen/lab results.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -69,7 +69,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
route: RADIOLOGY_PATIENT,
nameLine1: TranslationBase.of(context).radiology,
nameLine2: TranslationBase.of(context).result,
icon: 'patient/health_summary.png'),
icon: 'assets/images/svgs/profile_screen/health summary.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -78,7 +78,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
route: ORDER_PRESCRIPTION_NEW,
nameLine1: TranslationBase.of(context).patient,
nameLine2: TranslationBase.of(context).prescription,
icon: 'patient/order_prescription.png'),
icon: 'assets/images/svgs/profile_screen/order prescription.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -88,7 +88,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
isDischargedPatient: isDischargedPatient,
nameLine1: TranslationBase.of(context).progress,
nameLine2: TranslationBase.of(context).note,
icon: 'patient/Progress_notes.png'),
icon: 'assets/images/svgs/profile_screen/Progress notes.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -98,7 +98,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
isDischargedPatient: isDischargedPatient,
nameLine1: "Order", //"Text",
nameLine2: "Sheet", //TranslationBase.of(context).orders,
icon: 'patient/Progress_notes.png'),
icon: 'assets/images/svgs/profile_screen/Progress notes.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -107,7 +107,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
route: ORDER_PROCEDURE,
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).procedures,
icon: 'patient/Order_Procedures.png'),
icon: 'assets/images/svgs/profile_screen/Order Procedures.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -118,7 +118,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
//TranslationBase.of(context).medicalReport,
nameLine2: "Summary",
//TranslationBase.of(context).summaryReport,
icon: 'patient/health_summary.png'),
icon: 'assets/images/svgs/profile_screen/health summary.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -130,7 +130,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
//TranslationBase.of(context).medicalReport,
nameLine2: "Report", //Report
//TranslationBase.of(context).summaryReport,
icon: 'patient/health_summary.png'),
icon: 'assets/images/svgs/profile_screen/health summary.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -149,7 +149,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
route: PATIENT_INSURANCE_APPROVALS_NEW,
nameLine1: TranslationBase.of(context).insurance,
nameLine2: TranslationBase.of(context).approvals,
icon: 'patient/vital_signs.png'),
icon: 'assets/images/svgs/profile_screen/insurance approval.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -159,7 +159,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
route: null,
nameLine1: "Discharge",
nameLine2: "Summery",
icon: 'patient/patient_sick_leave.png'),
icon: 'assets/images/svgs/profile_screen/patient sick leave.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -168,7 +168,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
route: ADD_SICKLEAVE,
nameLine1: TranslationBase.of(context).patientSick,
nameLine2: TranslationBase.of(context).leave,
icon: 'patient/patient_sick_leave.png'),
icon: 'assets/images/svgs/profile_screen/patient sick leave.svg'),
],
),
);

@ -64,7 +64,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
nameLine1: TranslationBase.of(context).vital,
nameLine2: TranslationBase.of(context).signs,
route: VITAL_SIGN_DETAILS,
icon: 'patient/vital_signs.png'),
icon: 'assets/images/svgs/profile_screen/vital signs.svg'),
// if (selectedPatientType != 7)
PatientProfileButton(
key: key,
@ -76,7 +76,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
"Health", //TranslationBase.of(context).medicalReport,
nameLine2:
"Summary", //TranslationBase.of(context).summaryReport,
icon: 'patient/health_summary.png'),
icon: 'assets/images/svgs/profile_screen/health summary.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -85,7 +85,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
route: LAB_RESULT,
nameLine1: TranslationBase.of(context).lab,
nameLine2: TranslationBase.of(context).result,
icon: 'patient/lab_results.png'),
icon: 'assets/images/svgs/profile_screen/lab results.svg'),
// if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
@ -96,7 +96,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
route: RADIOLOGY_PATIENT,
nameLine1: TranslationBase.of(context).radiology,
nameLine2: TranslationBase.of(context).service,
icon: 'patient/health_summary.png'),
icon: 'assets/images/svgs/profile_screen/health summary.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -105,7 +105,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
route: PATIENT_ECG,
nameLine1: TranslationBase.of(context).patient,
nameLine2: "ECG",
icon: 'patient/patient_sick_leave.png'),
icon: 'assets/images/svgs/profile_screen/ECG.svg'),
PatientProfileButton(
key: key,
patient: patient,
@ -114,7 +114,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
route: ORDER_PRESCRIPTION_NEW,
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).prescription,
icon: 'patient/order_prescription.png'),
icon: 'assets/images/svgs/profile_screen/order prescription.svg'),
// if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
@ -124,7 +124,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
route: ORDER_PROCEDURE,
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).procedures,
icon: 'patient/Order_Procedures.png'),
icon: 'assets/images/svgs/profile_screen/Order Procedures.svg'),
//if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
@ -134,7 +134,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
route: PATIENT_INSURANCE_APPROVALS_NEW,
nameLine1: TranslationBase.of(context).insurance,
nameLine2: TranslationBase.of(context).service,
icon: 'patient/vital_signs.png'),
icon: 'assets/images/svgs/profile_screen/insurance approval.svg'),
// if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
@ -144,7 +144,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
route: ADD_SICKLEAVE,
nameLine1: TranslationBase.of(context).patientSick,
nameLine2: TranslationBase.of(context).leave,
icon: 'patient/patient_sick_leave.png'),
icon: 'assets/images/svgs/profile_screen/patient sick leave.svg'),
if (patient.appointmentNo != null &&
patient.appointmentNo != 0)
PatientProfileButton(
@ -157,7 +157,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient.patientStatusType != 43 ? true : false,
nameLine1: TranslationBase.of(context).patient,
nameLine2: TranslationBase.of(context).ucaf,
icon: 'patient/ucaf.png'),
icon: 'assets/images/svgs/profile_screen/UCAF.svg'),
if (patient.appointmentNo != null &&
patient.appointmentNo != 0)
PatientProfileButton(
@ -170,7 +170,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient.patientStatusType != 43 ? true : false,
nameLine1: TranslationBase.of(context).referral,
nameLine2: TranslationBase.of(context).patient,
icon: 'patient/refer_patient.png'),
icon: 'assets/images/svgs/profile_screen/refer patient.svg'),
if (patient.appointmentNo != null &&
patient.appointmentNo != 0)
PatientProfileButton(
@ -183,7 +183,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient.patientStatusType != 43 ? true : false,
nameLine1: TranslationBase.of(context).admission,
nameLine2: TranslationBase.of(context).request,
icon: 'patient/admission_req.png'),
icon: 'assets/images/svgs/profile_screen/admission req.svg'),
if (isInpatient)
PatientProfileButton(
key: key,
@ -193,7 +193,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
route: PROGRESS_NOTE,
nameLine1: TranslationBase.of(context).progress,
nameLine2: TranslationBase.of(context).note,
icon: 'patient/Progress_notes.png'),
icon: 'assets/images/svgs/profile_screen/Progress notes.svg'),
if (isInpatient)
PatientProfileButton(
key: key,
@ -203,7 +203,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
route: ORDER_NOTE,
nameLine1: "Order", //"Text",
nameLine2: "Sheet",
icon: 'patient/Progress_notes.png'),
icon: 'assets/images/svgs/profile_screen/Progress notes.svg'),
],
),
),

@ -50,6 +50,7 @@ class _BottomNavBarState extends State<BottomNavBar> {
BottomNavigationItem(
icon: DoctorApp.home_1,
activeIcon: DoctorApp.home_active_1,
svgPath: "assets/images/svgs/bottom_nav/home-active.svg",
changeIndex: _changeIndex,
index: widget.index,
currentIndex: 0,
@ -59,6 +60,7 @@ class _BottomNavBarState extends State<BottomNavBar> {
BottomNavigationItem(
icon: DoctorApp.schedule_1,
activeIcon: DoctorApp.schedule_active_1,
svgPath: "assets/images/svgs/bottom_nav/schedule-active.svg",
changeIndex: _changeIndex,
index: widget.index,
currentIndex: 1,
@ -69,6 +71,7 @@ class _BottomNavBarState extends State<BottomNavBar> {
BottomNavigationItem(
icon: DoctorApp.qr_reader,
activeIcon: DoctorApp.qr_reader_active_1,
svgPath: "assets/images/svgs/bottom_nav/reader-active.svg",
changeIndex: _changeIndex,
index: widget.index,
currentIndex: 2,
@ -79,6 +82,7 @@ class _BottomNavBarState extends State<BottomNavBar> {
BottomNavigationItem(
icon: DoctorApp.dr_reply_1,
activeIcon: DoctorApp.dr_reply_active_1,
svgPath: "assets/images/svgs/bottom_nav/reply-active.svg",
changeIndex: _changeIndex,
index: widget.index,
currentIndex: 3,

@ -5,6 +5,7 @@ import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/doctor_replay_view_model.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart';
import '../../locator.dart';
@ -17,6 +18,8 @@ class BottomNavigationItem extends StatelessWidget {
final int currentIndex;
final String name;
final DashboardViewModel dashboardViewModel;
final String svgPath;
BottomNavigationItem(
{this.icon,
@ -25,7 +28,7 @@ class BottomNavigationItem extends StatelessWidget {
this.index,
this.currentIndex,
this.name,
this.dashboardViewModel});
this.dashboardViewModel, this.svgPath});
@override
Widget build(BuildContext context) {
@ -58,8 +61,9 @@ class BottomNavigationItem extends StatelessWidget {
height: 15,
),
Container(
child: Icon(currentIndex == index ? activeIcon : icon,
color: AppGlobal.appTextColor, size: 22.0),
child: SvgPicture.asset(svgPath,width: SizeConfig.widthMultiplier* (10), height:SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 10:SizeConfig.isHeightShort ?8.5 : 7) ) * 40,
),
),
SizedBox(
height: 8,
@ -71,6 +75,7 @@ class BottomNavigationItem extends StatelessWidget {
fontSize:
SizeConfig.getTextMultiplierBasedOnWidth() *
2,
letterSpacing: 0.24,
color: AppGlobal.appTextColor,
fontWeight: FontWeight.w600) //#989898,
),

@ -706,7 +706,7 @@ packages:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0-nullsafety.4"
version: "1.3.0-nullsafety.3"
mime:
dependency: transitive
description:
@ -1040,7 +1040,7 @@ packages:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
version: "1.10.0-nullsafety.2"
version: "1.10.0-nullsafety.1"
sticky_headers:
dependency: "direct main"
description:
@ -1245,5 +1245,5 @@ packages:
source: hosted
version: "2.2.1"
sdks:
dart: ">=2.10.2 <=2.11.0-213.1.beta"
dart: ">=2.10.2 <2.11.0"
flutter: ">=1.22.2 <2.0.0"

@ -131,6 +131,8 @@ flutter:
- assets/images/dashboard/
- assets/images/login/
- assets/images/svgs/verification/
- assets/images/svgs/profile_screen/
- assets/images/svgs/bottom_nav/
- assets/images/patient/
- assets/images/patient/vital_signs/

Loading…
Cancel
Save