first step from fix home page design

merge-requests/709/head
Elham Rababah 5 years ago
parent 0c0062091a
commit 2bff3a594c

@ -328,4 +328,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69 PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69
COCOAPODS: 1.10.1 COCOAPODS: 1.10.0.rc.1

@ -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 = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient"; const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";

@ -18,18 +18,18 @@ class DashboardSliderItemWidget extends StatelessWidget {
children: <Widget>[ children: <Widget>[
AppText( AppText(
item.kPIName, item.kPIName,
fontSize: SizeConfig.textMultiplier * 2.2, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
], ],
), ),
new Container( new Container(
height: 110, height: SizeConfig.heightMultiplier* 20,
child: ListView( child: ListView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
children: children:
List.generate(item.summaryoptions.length, (int index) { List.generate(item.summaryoptions.length, (int index) {
return GetActivityButton(item.summaryoptions[index]); return GetActivityCard(item.summaryoptions[index]);
}))) })))
], ],
); );

@ -143,14 +143,14 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context)
.patients, .patients,
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontHeight: 0.5, fontHeight: 0.5,
), ),
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context)
.referral, .referral,
fontSize: 22, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 5,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
], ],

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
@ -24,10 +25,7 @@ class HomePageCard extends StatelessWidget {
return InkWell( return InkWell(
onTap: onTap, onTap: onTap,
child: Container( child: Container(
width: 120, width: SizeConfig.widthMultiplier * 22,
height: MediaQuery.of(context).orientation == Orientation.portrait
? 100
: 200,
margin: this.margin, margin: this.margin,
decoration: BoxDecoration( decoration: BoxDecoration(
color: !hasBorder color: !hasBorder

@ -35,13 +35,13 @@ class HomePatientCard extends StatelessWidget {
child: Stack( child: Stack(
children: [ children: [
Positioned( Positioned(
bottom: 0.1, bottom: 0.01,
right: 0.5, right: 0.2,
width: 23.0, width: 10.0,
height: 25.0, height: 25.0,
child: Icon( child: Icon(
cardIcon, cardIcon,
size: 60, size: SizeConfig.widthMultiplier* 15,
color: backgroundIconColor, color: backgroundIconColor,
), ),
), ),
@ -52,7 +52,7 @@ class HomePatientCard extends StatelessWidget {
children: [ children: [
Icon( Icon(
cardIcon, cardIcon,
size: 30, size: SizeConfig.widthMultiplier* 8,
color: textColor, color: textColor,
), ),
SizedBox( SizedBox(

@ -1,4 +1,5 @@
import 'package:doctor_app_flutter/config/config.dart'; 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/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart';
import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
@ -48,7 +49,6 @@ class HomeScreen extends StatefulWidget {
class _HomeScreenState extends State<HomeScreen> { class _HomeScreenState extends State<HomeScreen> {
bool isLoading = false; bool isLoading = false;
ProjectViewModel projectsProvider; ProjectViewModel projectsProvider;
var _isInit = true;
DoctorProfileModel profile; DoctorProfileModel profile;
bool isExpanded = false; bool isExpanded = false;
bool isInpatient = false; bool isInpatient = false;
@ -87,7 +87,7 @@ class _HomeScreenState extends State<HomeScreen> {
child: Stack(children: [ child: Stack(children: [
IconButton( IconButton(
icon: Image.asset('assets/images/menu.png', icon: Image.asset('assets/images/menu.png',
height: 50, width: 50), width:SizeConfig.widthMultiplier* 7,),
iconSize: 18, iconSize: 18,
color: Colors.black, color: Colors.black,
onPressed: () => Scaffold.of(context).openDrawer(), onPressed: () => Scaffold.of(context).openDrawer(),
@ -112,7 +112,7 @@ class _HomeScreenState extends State<HomeScreen> {
? projectsProvider ? projectsProvider
.doctorClinicsList[0].clinicID .doctorClinicsList[0].clinicID
: clinicId, : clinicId,
iconSize: 25, iconSize: SizeConfig.widthMultiplier* 7,
elevation: 16, elevation: 16,
selectedItemBuilder: selectedItemBuilder:
(BuildContext context) { (BuildContext context) {
@ -122,7 +122,7 @@ class _HomeScreenState extends State<HomeScreen> {
return Row( return Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.end, MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Column( Column(
mainAxisAlignment: mainAxisAlignment:
@ -159,8 +159,8 @@ class _HomeScreenState extends State<HomeScreen> {
fontSize: fontSize:
projectsProvider projectsProvider
.isArabic .isArabic
? 10 ? SizeConfig.widthMultiplier* 3.5
: 11, : SizeConfig.widthMultiplier* 4,
textAlign: textAlign:
TextAlign TextAlign
.center, .center,
@ -169,8 +169,9 @@ class _HomeScreenState extends State<HomeScreen> {
], ],
), ),
AppText(item.clinicName, AppText(item.clinicName,
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: MediaQuery.of(context).size.width * .6) * 5,
color: Colors.black, color: Colors.black,
textOverflow:TextOverflow.ellipsis ,
fontWeight: fontWeight:
FontWeight.bold, FontWeight.bold,
textAlign: TextAlign.end), textAlign: TextAlign.end),
@ -264,8 +265,7 @@ class _HomeScreenState extends State<HomeScreen> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: 10, height: SizeConfig.heightMultiplier *1, ),
),
Container( Container(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -273,30 +273,27 @@ class _HomeScreenState extends State<HomeScreen> {
children: [ children: [
AppText( AppText(
TranslationBase.of(context).patients, TranslationBase.of(context).patients,
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* 3,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontHeight: .5, fontHeight: .5,
), ),
AppText( AppText(
TranslationBase.of(context).services, TranslationBase.of(context).services,
fontSize: 22, fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* 6,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
], ],
)), )),
SizedBox( SizedBox(
height: 10, height: SizeConfig.heightMultiplier *1,
), ),
Container( Container(
height: 120, height: SizeConfig.heightMultiplier* 18,
child: ListView( child: ListView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
children: [ children: [
...homePatientsCardsWidget(model), ...homePatientsCardsWidget(model),
])), ])),
SizedBox(
height: 20,
),
], ],
), ),
), ),

@ -1,10 +1,11 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class GetActivityButton extends StatelessWidget { class GetActivityCard extends StatelessWidget {
final value; final value;
GetActivityButton(this.value); GetActivityCard(this.value);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -24,14 +25,14 @@ class GetActivityButton extends StatelessWidget {
children: [ children: [
AppText( AppText(
value.value.toString(), value.value.toString(),
fontSize: 27, fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: MediaQuery.of(context).size.height * 0.125)* 12,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
), ),
AppText( AppText(
value.kPIParameter, value.kPIParameter,
textOverflow: TextOverflow.clip, textOverflow: TextOverflow.clip,
fontSize: 10, fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: MediaQuery.of(context).size.height * 0.125)* 12,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart'; import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -20,11 +21,10 @@ class GetOutPatientStack extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [ children: [
Container( Container(
height: 30,
child: AppText( child: AppText(
value.kPIName, value.kPIName,
medium: true, medium: true,
fontSize: 14, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4,
), ),
), ),
Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: list) Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: list)
@ -63,7 +63,7 @@ class GetOutPatientStack extends StatelessWidget {
), ),
), ),
Container( Container(
height: (MediaQuery.of(context).size.height * 0.24 ), height: MediaQuery.of(context).size.height * 0.20,
margin: EdgeInsets.only(left: 5, top: 5), margin: EdgeInsets.only(left: 5, top: 5),
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: RotatedBox( child: RotatedBox(
@ -75,14 +75,14 @@ class GetOutPatientStack extends StatelessWidget {
children: [ children: [
AppText( AppText(
value.kPIParameter, value.kPIParameter,
fontSize: 10, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5,
textAlign: TextAlign.center, textAlign: TextAlign.center,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
AppText( AppText(
' (' + value.value.toString() + ') ', ' (' + value.value.toString() + ') ',
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5,
textAlign: TextAlign.center, textAlign: TextAlign.center,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -24,7 +25,7 @@ class RowCounts extends StatelessWidget {
name, name,
color: Colors.black, color: Colors.black,
textAlign: TextAlign.start, // from TextAlign.center textAlign: TextAlign.start, // from TextAlign.center
fontSize: 11, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5,
textOverflow: TextOverflow.ellipsis, textOverflow: TextOverflow.ellipsis,
), ),
), ),
@ -32,7 +33,7 @@ class RowCounts extends StatelessWidget {
' (' + count.toString() + ')', ' (' + count.toString() + ')',
color: Colors.black, color: Colors.black,
textAlign: TextAlign.center, textAlign: TextAlign.center,
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
) )
], ],

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -35,8 +36,8 @@ class ProfileWelcomeWidget extends StatelessWidget {
child: Image.network( child: Image.network(
authenticationViewModel.doctorProfile.doctorImageURL, authenticationViewModel.doctorProfile.doctorImageURL,
fit: BoxFit.fill, fit: BoxFit.fill,
width: 75, width: SizeConfig.widthMultiplier* 11,
height: 75, height: SizeConfig.widthMultiplier* 11,
), ),
), ),
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,

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

Loading…
Cancel
Save