master_new_changes
Aamir.Muhammad 1 year ago
parent 31a9b71b83
commit 4de57025a9

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -300,8 +300,26 @@ class MyLocales {
}
class MyFonts {
static const poppinsFont = "packages/mc_common_app/Poppins";
static const gessTwoFont = "packages/mc_common_app/GessTwo";
static const poppinsFont = 'Poppins';
static const gessTwoFont = 'GessTwo';
static const FontWeight Thin = FontWeight.w100;
static const FontWeight ExtraLight = FontWeight.w200;
static const FontWeight Light = FontWeight.w300;
static const FontWeight Regular = FontWeight.w400;
static const FontWeight Medium = FontWeight.w500;
static const FontWeight SemiBold = FontWeight.w600;
static const FontWeight Bold = FontWeight.w700;
static const FontWeight ExtraBold = FontWeight.w800;
static const FontWeight Black = FontWeight.w900;
static const FontWeight ItalicRegular = FontWeight.w400;
static const FontWeight ItalicMedium = FontWeight.w500;
static const FontWeight ItalicSemiBold = FontWeight.w600;
static const FontWeight ItalicBold = FontWeight.w700;
static const FontWeight ItalicExtraBold = FontWeight.w800;
static const FontWeight ItalicBlack = FontWeight.w900;
}
class SignalrConsts {

@ -1,6 +1,7 @@
import 'package:auto_size_text/auto_size_text.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart';
import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/theme/colors.dart';
import 'package:mc_common_app/utils/enums.dart';
@ -30,7 +31,7 @@ extension EmailValidator on String {
decoration: isUnderLine ? TextDecoration.underline : textDecoration ?? TextDecoration.none,
decorationColor: decorationColor,
fontSize: fontSize ?? 10,
fontWeight: isBold ? FontWeight.bold : fontWeight ?? FontWeight.w600,
fontWeight: isBold ? FontWeight.bold : fontWeight ?? MyFonts.SemiBold,
color: color ?? MyColors.darkTextColor,
letterSpacing: letterSpacing,
),

@ -12,7 +12,7 @@ class AppTheme {
primaryTextTheme: const TextTheme(
titleLarge: TextStyle(color: Colors.white),
),
colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.orange).copyWith(background: Colors.white),
colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.orange).copyWith(surface: Colors.white),
);
}
}

@ -86,7 +86,51 @@ flutter:
fonts:
- family: Poppins
fonts:
- asset: assets/fonts/Poppins-Thin.ttf
weight: 100
style: normal
- asset: assets/fonts/Poppins-ExtraLight.ttf
weight: 200
style: normal
- asset: assets/fonts/Poppins-Light.ttf
weight: 300
style: normal
- asset: assets/fonts/Poppins-Regular.ttf
weight: 400
style: normal
- asset: assets/fonts/Poppins-Medium.ttf
weight: 500
style: normal
- asset: assets/fonts/Poppins-SemiBold.ttf
weight: 600
style: normal
- asset: assets/fonts/Poppins-Bold.ttf
weight: 700
style: normal
- asset: assets/fonts/Poppins-ExtraBold.ttf
weight: 800
style: normal
- asset: assets/fonts/Poppins-Black.ttf
weight: 900
style: normal
- asset: assets/fonts/Poppins-Italic.ttf
weight: 400
style: italic
- asset: assets/fonts/Poppins-MediumItalic.ttf
weight: 500
style: italic
- asset: assets/fonts/Poppins-SemiBoldItalic.ttf
weight: 600
style: italic
- asset: assets/fonts/Poppins-BoldItalic.ttf
weight: 700
style: italic
- asset: assets/fonts/Poppins-ExtraBoldItalic.ttf
weight: 800
style: italic
- asset: assets/fonts/Poppins-BlackItalic.ttf
weight: 900
style: italic
- family: GessTwo
fonts:
- asset: assets/fonts/GESS-Two-Light.otf

Loading…
Cancel
Save