small fix

merge-requests/2/merge
Elham Rababh 4 years ago
parent d553e757c2
commit dd3ce7cff7

@ -1,5 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:queuing_system/core/base/app_scaffold_widget.dart'; import 'package:queuing_system/core/base/app_scaffold_widget.dart';
import 'package:queuing_system/core/config/config.dart';
import 'package:queuing_system/core/config/size_config.dart';
import 'package:queuing_system/header/app_header.dart'; import 'package:queuing_system/header/app_header.dart';
import 'package:queuing_system/home/que_item.dart'; import 'package:queuing_system/home/que_item.dart';
import 'package:queuing_system/utils/signalR_utils.dart'; import 'package:queuing_system/utils/signalR_utils.dart';
@ -9,6 +11,10 @@ class MyHomePage extends StatefulWidget {
String title ="MyHomePage"; String title ="MyHomePage";
bool haveOnePatient = false;
bool haveLessThan3Patient = false;
bool haveListOfPatient = true;
@override @override
State<MyHomePage> createState() => _MyHomePageState(); State<MyHomePage> createState() => _MyHomePageState();
@ -20,14 +26,69 @@ class _MyHomePageState extends State<MyHomePage> {
SignalRHelper signalRHelper= SignalRHelper(); SignalRHelper signalRHelper= SignalRHelper();
return AppScaffold( return AppScaffold(
appBar: AppHeader(), appBar: AppHeader(),
body: Center( body: Column(
child: Column( children: [
mainAxisAlignment: MainAxisAlignment.center, SizedBox(height: SizeConfig.getHeightMultiplier() * (widget.haveOnePatient?20: 5)),
children: const <Widget>[ widget.haveListOfPatient?Row(
QueItem(queNo: "OBG-T45", isFirstLine: true,), children: [
FirstColumn(),
Container(width: 20,height:SizeConfig.getHeightMultiplier() *40,color: Colors.grey, margin: EdgeInsets.only(left: 30),),
Column(children: [
QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true,),
QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true,),
QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true,),
QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true,),
QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true,),
],)
],
): FirstColumn(),
],
),
bottomSheet: Container(
color: Colors.transparent,
height: 280,
width: double.infinity,
padding: const EdgeInsets.only(left: 50, right: 50, bottom: 10,),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center ,
children: [
AppText(
"Powered By",
letterSpacing: -2.48,
color: AppGlobal.appTextColor,
fontSize: SizeConfig.getWidthMultiplier() * 3,
),
const SizedBox(width: 40,),
Image.asset( "assets/images/cloud_logo.png",),
], ],
), ),
), // This trailing comma makes auto-formatting nicer for build methods. ),// This trailing comma makes auto-formatting nicer for build methods.
);
}
}
class FirstColumn extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Column(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
QueItem(queNo: "OBG-T45", isFirstLine: true, isNurseVisit: true,),
SizedBox(height: SizeConfig.getHeightMultiplier() * 5,),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
QueItem(queNo: "OBG-T45", isSecondLine: true, isNurseVisit: true,),
QueItem(queNo: "OBG-T45", isSecondLine: true, isNurseVisit: false,),
],
),
],
); );
} }
} }

@ -29,10 +29,10 @@ class QueItem extends StatelessWidget {
queNo, queNo,
fontSize: SizeConfig.getWidthMultiplier() * fontSize: SizeConfig.getWidthMultiplier() *
(isFirstLine (isFirstLine
? 8 ? 13
: isSecondLine : isSecondLine
? 3.5 ? 8.5
: 3.2), : 5.5),
letterSpacing: -9.32, letterSpacing: -9.32,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@ -42,14 +42,22 @@ class QueItem extends StatelessWidget {
children: [ children: [
SvgPicture.asset(isNurseVisit SvgPicture.asset(isNurseVisit
? "assets/images/nurseicon.svg" ? "assets/images/nurseicon.svg"
: "assets/images/doctoricon.svg", height:80 ,), : "assets/images/doctoricon.svg", height:(isFirstLine
? 120
: isSecondLine
? 80
: 70) ,),
SizedBox(width: 10,), SizedBox(width: 10,),
AppText( AppText(
isNurseVisit ? "Please visit Nurse" : "Please visit doctor", isNurseVisit ? "Please visit Nurse" : "Please visit doctor",
color: isNurseVisit color: isNurseVisit
? AppGlobal.appGreenColor ? AppGlobal.appGreenColor
: AppGlobal.appRedColor, : AppGlobal.appRedColor,
fontSize: SizeConfig.getWidthMultiplier() * (2.5), fontSize: SizeConfig.getWidthMultiplier() * (isFirstLine
? 4
: isSecondLine
? 3
: 3.2),
letterSpacing: -2.6, letterSpacing: -2.6,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),

Loading…
Cancel
Save