Merge branch 'fonts_fixes' into 'development'

Fonts fixes

See merge request Cloud_Solution/queuing_system!3
merge-requests/4/merge
Elham Ali 3 years ago
commit af86cc7a10

@ -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';

@ -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<MyHomePage> {
}
startTimer() {
Timer.periodic(Duration(seconds: 1), (timer) {
Timer.periodic(const Duration(seconds: 1), (timer) {
if (remainingTime == 0) {
setState(() {
remainingTime = 30;

@ -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

@ -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,

@ -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,

Loading…
Cancel
Save