Edit some design issues

queuing_system_third_page
RoaaGhali98 4 years ago
parent 449b0f3014
commit e1b39df153

@ -18,6 +18,7 @@ class AppGlobal {
static Color appTextColor = const Color(0xFF2B353E); static Color appTextColor = const Color(0xFF2B353E);
static Color scheduleTextColor = const Color(0xFF2E303A); static Color scheduleTextColor = const Color(0xFF2E303A);
static Color inProgressColor = const Color(0xFFCC9B14); static Color inProgressColor = const Color(0xFFCC9B14);
static Color appLightGreyColor = const Color(0xFF575757); static Color appGreyColor = const Color(0xFF575757);
static Color appLightGreyColor = const Color(0xFFE6E6E6);
} }

@ -0,0 +1,6 @@
enum FontType {
Poppins_Bold,
poppins_Medium,
poppins_Regular,
poppins_SemiBold,
}

@ -11,11 +11,10 @@ import 'package:queuing_system/widget/data_display/app_texts_widget.dart';
class MyHomePage extends StatefulWidget { class MyHomePage extends StatefulWidget {
String title ="MyHomePage"; String title ="MyHomePage";
bool haveOnePatient = false; bool haveOnePatient = true;
bool have3Patient = true; bool have3Patient = false;
bool haveListOfPatient = false; bool haveListOfPatient = true;
@override @override
@ -30,7 +29,7 @@ class _MyHomePageState extends State<MyHomePage> {
appBar: AppHeader(), appBar: AppHeader(),
body: Column( body: Column(
children: [ children: [
SizedBox(height: SizeConfig.getHeightMultiplier() * (widget.haveOnePatient?20: 3)), SizedBox(height: SizeConfig.getHeightMultiplier() * (widget.haveOnePatient?20: 2)),
widget.haveListOfPatient? widget.haveListOfPatient?
Row( Row(
children: [ children: [
@ -44,7 +43,7 @@ class _MyHomePageState extends State<MyHomePage> {
Container( Container(
width: 10, width: 10,
height:SizeConfig.getHeightMultiplier()*40, height:SizeConfig.getHeightMultiplier()*40,
color: Colors.grey, color: AppGlobal.appLightGreyColor,
), ),
if(widget.haveListOfPatient) if(widget.haveListOfPatient)
const SizedBox( const SizedBox(
@ -58,7 +57,7 @@ class _MyHomePageState extends State<MyHomePage> {
), ),
bottomSheet: Container( bottomSheet: Container(
color: Colors.transparent, color: Colors.transparent,
height: Utils.getHeight(), height: Utils.getHeight()* 0.9,
width: double.infinity, width: double.infinity,
child: Row( child: Row(
children: [ children: [

@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:queuing_system/core/config/config.dart'; import 'package:queuing_system/core/config/config.dart';
import 'package:queuing_system/core/config/size_config.dart'; import 'package:queuing_system/core/config/size_config.dart';
import 'package:queuing_system/home/que_item/que_item_widget.dart';
import 'package:queuing_system/widget/data_display/app_texts_widget.dart'; import 'package:queuing_system/widget/data_display/app_texts_widget.dart';
class QueItem extends StatelessWidget { class QueItem extends StatelessWidget {
@ -26,51 +27,16 @@ class QueItem extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return haveListOfPatient? return haveListOfPatient?
Padding( Padding(
padding: const EdgeInsets.all(30.0), padding: const EdgeInsets.all(45.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
AppText( QueItemWidget(
queNo, isFirstLine: isFirstLine,
fontSize: SizeConfig.getWidthMultiplier() * isNurseVisit: isNurseVisit,
(isFirstLine isSecondLine: isSecondLine,
? 13 queNo: queNo,
: isSecondLine
? 8.5
: 5.5),
letterSpacing: -5.00,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins-Bold.ttf',
), ),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
isNurseVisit
? "assets/images/nurseicon.svg"
: "assets/images/doctoricon.svg", height:(isFirstLine
? 40
: isSecondLine
? 40
: 40) ,),
const SizedBox(width: 8,),
AppText(
isNurseVisit ? "Please visit Nurse" : "Please visit doctor",
color: isNurseVisit
? AppGlobal.appGreenColor
: AppGlobal.appRedColor,
fontSize: SizeConfig.getWidthMultiplier() * (isFirstLine
? 3.3
: isSecondLine
? 3.3
: 3.3),
letterSpacing: -2.6,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins-Bold.ttf',
),
],
)
], ],
), ),
) )
@ -100,14 +66,14 @@ class QueItem extends StatelessWidget {
isNurseVisit isNurseVisit
? "assets/images/nurseicon.svg" ? "assets/images/nurseicon.svg"
: "assets/images/doctoricon.svg", height:(isFirstLine : "assets/images/doctoricon.svg", height:(isFirstLine
? 40 ? SizeConfig.getHeightMultiplier()*3
: isSecondLine : isSecondLine
? 40 ? SizeConfig.getHeightMultiplier()*3
: 40) ,), : SizeConfig.getHeightMultiplier()*3) ,),
const SizedBox(width: 8,), const SizedBox(width: 8,),
AppText( AppText(
isNurseVisit ? " Please visit Nurse" : " Please visit doctor", isNurseVisit ? " Please visit Nurse" : " Please visit doctor",
color: AppGlobal.appLightGreyColor, color: AppGlobal.appGreyColor,
fontSize: SizeConfig.getWidthMultiplier() * (isFirstLine fontSize: SizeConfig.getWidthMultiplier() * (isFirstLine
? 3.3 ? 3.3
: isSecondLine : isSecondLine

Loading…
Cancel
Save