From aad9f695ff818cfea693f2311e46d0441b4e9b52 Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Mon, 4 Apr 2022 15:30:52 +0300 Subject: [PATCH] Fixing some design issues --- lib/header/app_header.dart | 1 - lib/home/home_screen.dart | 5 +---- lib/home/que_item/que_item.dart | 2 +- lib/home/que_item/que_item_widget.dart | 9 ++++----- lib/main.dart | 2 +- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/lib/header/app_header.dart b/lib/header/app_header.dart index f0fad76..aadf25b 100644 --- a/lib/header/app_header.dart +++ b/lib/header/app_header.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:queuing_system/core/config/config.dart'; -import 'package:queuing_system/core/config/size_config.dart'; import 'package:queuing_system/utils/utils.dart'; import 'package:queuing_system/widget/data_display/app_texts_widget.dart'; diff --git a/lib/home/home_screen.dart b/lib/home/home_screen.dart index 7bc7ab4..18c3274 100644 --- a/lib/home/home_screen.dart +++ b/lib/home/home_screen.dart @@ -1,16 +1,13 @@ import 'dart:async'; - import 'package:flutter/material.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/home/que_item/que_item.dart'; import 'package:queuing_system/home/que_item_list.dart'; import 'package:queuing_system/utils/signalR_utils.dart'; import 'package:queuing_system/utils/utils.dart'; import 'package:queuing_system/widget/data_display/app_texts_widget.dart'; - import 'first_column.dart'; class MyHomePage extends StatefulWidget { @@ -36,7 +33,7 @@ class _MyHomePageState extends State { } startTimer() { - Timer.periodic(Duration(seconds: 1), (timer) { + Timer.periodic(const Duration(seconds: 1), (timer) { if (remainingTime == 0) { setState(() { remainingTime = 30; diff --git a/lib/home/que_item/que_item.dart b/lib/home/que_item/que_item.dart index ef4a21f..39ad8c4 100644 --- a/lib/home/que_item/que_item.dart +++ b/lib/home/que_item/que_item.dart @@ -70,7 +70,7 @@ class QueItem extends StatelessWidget { : "assets/images/doctoricon.svg", height:SizeConfig.getHeightMultiplier()*2.5 ,), const SizedBox(width: 4,), AppText( - isNurseVisit ? " Please Visit Nurse" : " Please Visit Doctor", + isNurseVisit ? " Please Visit Nurse" : " Please Visit Doctor", color: AppGlobal.appGreyColor, fontSize: SizeConfig.getWidthMultiplier() * (isFirstLine ? 3.3 diff --git a/lib/home/que_item/que_item_widget.dart b/lib/home/que_item/que_item_widget.dart index 43cf084..f327236 100644 --- a/lib/home/que_item/que_item_widget.dart +++ b/lib/home/que_item/que_item_widget.dart @@ -28,14 +28,13 @@ class QueItemWidget extends StatelessWidget { queNo, fontSize: SizeConfig.getWidthMultiplier() * (isFirstLine - ? 15 + ? 14 : isSecondLine - ? 9.5 + ? 8.5 : 5.5), - letterSpacing: -11.72, + letterSpacing: -13.72, fontWeight: FontWeight.bold, - fontFamily: 'Poppins-Bold.ttf', - + // fontFamily: 'Poppins-Bold.ttf', ), Row( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/main.dart b/lib/main.dart index ed701d3..f61e6b5 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -34,7 +34,7 @@ class MyApp extends StatelessWidget { primaryColor: Colors.grey, fontFamily: 'Poppins', dividerColor: Colors.grey[350], - backgroundColor: Color.fromRGBO(255, 255, 255, 1), + backgroundColor: const Color.fromRGBO(255, 255, 255, 1), ), home:MyHomePage() , debugShowCheckedModeBanner: false,