home design

middle_screen
Elham Rababah 5 years ago
parent 3d5bb08adf
commit 259ea53319

@ -10,8 +10,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'Label.dart'; import 'label.dart';
class DashboardReferralPatient extends StatelessWidget { class DashboardReferralPatient extends StatelessWidget {
final List<DashboardModel> dashboardItemList; final List<DashboardModel> dashboardItemList;
@ -58,12 +57,40 @@ class DashboardReferralPatient extends StatelessWidget {
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
SizedBox( SizedBox(
height: SizeConfig.getHeightMultiplier(height: height) * (SizeConfig.isHeightVeryShort?3:SizeConfig.isHeightShort?2: 2) height: SizeConfig
.getHeightMultiplier(
height: height) *
(SizeConfig.isHeightVeryShort
? 3
: SizeConfig.isHeightShort
? 2
: 2)
), ),
Label(firstLine:TranslationBase.of(context).patients ,secondLine:TranslationBase.of(context).referral,color: Color(0xFF2B353E), ), Label(firstLine: TranslationBase
.of(context)
.patients,
secondLine: TranslationBase
.of(context)
.referral,
color: Color(0xFF2B353E),
fontSize: SizeConfig
.getHeightMultiplier(
height: height) *
(SizeConfig.isHeightVeryShort
? 5
: SizeConfig.isHeightShort
? 7
: 12),),
SizedBox( SizedBox(
height: SizeConfig.getHeightMultiplier(height: height) * (SizeConfig.isHeightVeryShort?5:SizeConfig.isHeightShort?10: 12) height: SizeConfig
.getHeightMultiplier(
height: height) *
(SizeConfig.isHeightVeryShort
? 5
: SizeConfig.isHeightShort
? 10
: 12)
) )
], ],
),), ),),

@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/widgets/dashboard/activity_card.dart'; import 'package:doctor_app_flutter/widgets/dashboard/activity_card.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'Label.dart'; import 'label.dart';
class DashboardSliderItemWidget extends StatelessWidget { class DashboardSliderItemWidget extends StatelessWidget {
final DashboardModel item; final DashboardModel item;

@ -23,8 +23,8 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'Label.dart';
import 'home_screen_header.dart'; import 'home_screen_header.dart';
import 'label.dart';
class HomeScreen extends StatefulWidget { class HomeScreen extends StatefulWidget {
HomeScreen({Key key, this.title}) : super(key: key); HomeScreen({Key key, this.title}) : super(key: key);
@ -46,6 +46,8 @@ class _HomeScreenState extends State<HomeScreen> {
String clinicId; String clinicId;
AuthenticationViewModel authenticationViewModel; AuthenticationViewModel authenticationViewModel;
int colorIndex = 0; int colorIndex = 0;
final GlobalKey<ScaffoldState> scaffoldKey = new GlobalKey<ScaffoldState>();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -58,6 +60,7 @@ class _HomeScreenState extends State<HomeScreen> {
} }
return BaseView<DashboardViewModel>( return BaseView<DashboardViewModel>(
onModelReady: (model) async { onModelReady: (model) async {
await model.setFirebaseNotification( await model.setFirebaseNotification(
projectsProvider, authenticationViewModel); projectsProvider, authenticationViewModel);
@ -70,6 +73,9 @@ class _HomeScreenState extends State<HomeScreen> {
isShowAppBar: true, isShowAppBar: true,
appBar: HomeScreenHeader( appBar: HomeScreenHeader(
model: model, model: model,
onOpenDrawer: (){
Scaffold.of(context).openDrawer();
},
), ),
body: ListView(children: [ body: ListView(children: [
Column(children: <Widget>[ Column(children: <Widget>[

@ -17,11 +17,12 @@ import 'package:provider/provider.dart';
class HomeScreenHeader extends StatefulWidget with PreferredSizeWidget { class HomeScreenHeader extends StatefulWidget with PreferredSizeWidget {
final DashboardViewModel model; final DashboardViewModel model;
final Function onOpenDrawer;
double height = SizeConfig.heightMultiplier * double height = SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 10 : 6); (SizeConfig.isHeightVeryShort ? 10 : 6);
HomeScreenHeader({Key key, this.model}) : super(key: key); HomeScreenHeader({Key key, this.model, this.onOpenDrawer}) : super(key: key);
@override @override
_HomeScreenHeaderState createState() => _HomeScreenHeaderState(); _HomeScreenHeaderState createState() => _HomeScreenHeaderState();
@ -33,7 +34,8 @@ class HomeScreenHeader extends StatefulWidget with PreferredSizeWidget {
class _HomeScreenHeaderState extends State<HomeScreenHeader> { class _HomeScreenHeaderState extends State<HomeScreenHeader> {
ProjectViewModel projectsProvider; ProjectViewModel projectsProvider;
var clinicId; int clinicId;
AuthenticationViewModel authenticationViewModel; AuthenticationViewModel authenticationViewModel;
@ -53,7 +55,9 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
), ),
iconSize: SizeConfig.heightMultiplier * 2, iconSize: SizeConfig.heightMultiplier * 2,
color: Colors.black, color: Colors.black,
onPressed: () => Scaffold.of(context).openDrawer(), onPressed: (){
widget.onOpenDrawer();
},
), ),
Column( Column(
children: <Widget>[ children: <Widget>[
@ -113,9 +117,9 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
constraints: constraints:
BoxConstraints( BoxConstraints(
minWidth: SizeConfig minWidth: SizeConfig
.widthMultiplier * 5.5, .getHeightMultiplier(height: widget.height) * 50,
minHeight: SizeConfig minHeight: SizeConfig
.widthMultiplier * 5, .getHeightMultiplier(height: widget.height) * 50,
), ),
child: Center( child: Center(
child: AppText( child: AppText(
@ -129,9 +133,9 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
projectsProvider projectsProvider
.isArabic .isArabic
? SizeConfig ? SizeConfig
.widthMultiplier * 3.5 .getHeightMultiplier(height: widget.height)
: SizeConfig : SizeConfig
.widthMultiplier * 3, .getHeightMultiplier(height: widget.height) * 30,
textAlign: textAlign:
TextAlign TextAlign
.center, .center,

@ -7,11 +7,12 @@ import 'package:flutter/material.dart';
// ignore: must_be_immutable // ignore: must_be_immutable
class Label extends StatelessWidget { class Label extends StatelessWidget {
Label({ Label({
Key key, this.firstLine, this.secondLine, this.color, Key key, this.firstLine, this.secondLine, this.color, this.fontSize,
}) : super(key: key); }) : super(key: key);
final String firstLine; final String firstLine;
final String secondLine; final String secondLine;
Color color; Color color;
final double fontSize;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -24,7 +25,7 @@ class Label extends StatelessWidget {
children: [ children: [
AppText( AppText(
firstLine, firstLine,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *(SizeConfig.isWidthLarge?2:3) , fontSize: fontSize??SizeConfig.getTextMultiplierBasedOnWidth() *(SizeConfig.isWidthLarge?2:3) ,
// fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
color: color, color: color,
fontHeight: .5, fontHeight: .5,
@ -32,7 +33,7 @@ class Label extends StatelessWidget {
AppText( AppText(
secondLine, secondLine,
color: color, color: color,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 5, fontSize: fontSize??SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge?6:6.40),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
], ],

@ -1,8 +1,7 @@
import 'package:doctor_app_flutter/config/size_config.dart'; 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/screens/home/Label.dart'; import 'package:doctor_app_flutter/screens/home/label.dart';
import 'package:doctor_app_flutter/util/helpers.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_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -13,30 +12,40 @@ class GetOutPatientStack extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
double barHeight =
SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ? 23 : 19);
value.summaryoptions value.summaryoptions
.sort((Summaryoptions a, Summaryoptions b) => b.value - a.value); .sort((Summaryoptions a, Summaryoptions b) => b.value - a.value);
var list = new List<Widget>(); var list = new List<Widget>();
value.summaryoptions.forEach((result) => value.summaryoptions.forEach((result) => {
{list.add(getStack(result, value.summaryoptions.first.value,context))}); list.add(getStack(
result, value.summaryoptions.first.value, context, barHeight))
});
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [ children: [
Container( Container(
padding: EdgeInsets.symmetric(horizontal: 5,vertical: 5), padding: EdgeInsets.symmetric(horizontal: 5, vertical: 5),
child: Label(firstLine:Helpers.getLabelFromKPI(value.kPIName) ,secondLine:Helpers.getNameFromKPI(value.kPIName),color: Color(0xFF2B353E), ), child: Label(
firstLine: Helpers.getLabelFromKPI(value.kPIName),
secondLine: Helpers.getNameFromKPI(value.kPIName),
color: Color(0xFF2B353E),
fontSize: SizeConfig.getHeightMultiplier(height: barHeight) *
(SizeConfig.isHeightVeryShort
? 5
: SizeConfig.isHeightShort
? 9
: 12),
),
), ),
Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: list) Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: list)
], ],
); );
} }
getStack(Summaryoptions value, max, context, barHeight) {
getStack(Summaryoptions value, max,context) {
double barHeight = SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 23 : 19);
return Expanded( return Expanded(
child: Container( child: Container(
margin: EdgeInsets.symmetric(horizontal: 2), margin: EdgeInsets.symmetric(horizontal: 2),

@ -21,6 +21,7 @@ class AppScaffold extends StatelessWidget {
final Widget appBar; final Widget appBar;
final String subtitle; final String subtitle;
final bool isHomeIcon; final bool isHomeIcon;
final Key key;
AppScaffold( AppScaffold(
{this.appBarTitle = '', {this.appBarTitle = '',
this.body, this.body,
@ -30,7 +31,7 @@ class AppScaffold extends StatelessWidget {
this.bottomSheet, this.bottomSheet,
this.backgroundColor, this.backgroundColor,
this.isHomeIcon = true, this.isHomeIcon = true,
this.appBar, this.subtitle}); this.appBar, this.subtitle, this.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -42,6 +43,7 @@ class AppScaffold extends StatelessWidget {
}, },
child: Scaffold( child: Scaffold(
backgroundColor: backgroundColor ?? Colors.white, backgroundColor: backgroundColor ?? Colors.white,
key: key,
appBar: isShowAppBar appBar: isShowAppBar
? appBar ?? ? appBar ??
AppBar( AppBar(

Loading…
Cancel
Save