fixed layout of diets feed and added text styles

This commit is contained in:
Username1548
2024-11-14 17:29:19 +07:00
parent cfffc1bfe3
commit 937d7cded5
37 changed files with 1451 additions and 982 deletions

View File

@@ -54,7 +54,7 @@ class AppDecoration {
static BoxDecoration get outlineBlueGray => BoxDecoration(
border: Border.all(
color: appTheme.blueGray800,
color: appTheme.black,
width: 1,
strokeAlign: strokeAlignOutside,
),
@@ -90,7 +90,7 @@ class BorderRadiusStyle {
static BoxDecoration get outlineBlueGray => BoxDecoration(
border: Border.all(
color: appTheme.blueGray800,
color: appTheme.black,
width: 1,
strokeAlign: strokeAlignOutside,
),

View File

@@ -24,15 +24,15 @@ class CustomTextStyles {
);
static get bodyMediumBluegray800 => theme.textTheme.bodyMedium!.copyWith(
color: appTheme.blueGray800,
color: appTheme.black,
);
static get bodyMediumBluegray800_1 => theme.textTheme.bodyMedium!.copyWith(
color: appTheme.blueGray800,
color: appTheme.black,
);
static get bodyMediumBluegray800_2 => theme.textTheme.bodyMedium!.copyWith(
color: appTheme.blueGray800,
color: appTheme.black,
);
static get bodyMediumWhiteA700 => theme.textTheme.bodyMedium!.copyWith(
@@ -45,17 +45,17 @@ class CustomTextStyles {
);
static get bodySmallMulishBluegray800 => theme.textTheme.bodySmall!.mulish.copyWith(
color: appTheme.blueGray800,
color: appTheme.black,
fontSize: 12,
);
static get bodySmallMulishBluegray80012 => theme.textTheme.bodySmall!.mulish.copyWith(
color: appTheme.blueGray800,
color: appTheme.black,
fontSize: 12,
);
static get bodySmallMulishBluegray80012_1 => theme.textTheme.bodySmall!.mulish.copyWith(
color: appTheme.blueGray800,
color: appTheme.black,
fontSize: 12,
);
@@ -116,16 +116,16 @@ class CustomTextStyles {
);
static get titleSmallBluegray800 => theme.textTheme.titleSmall!.copyWith(
color: appTheme.blueGray800,
color: appTheme.black,
);
static get titleSmallBluegray800Bold => theme.textTheme.titleSmall!.copyWith(
color: appTheme.blueGray800,
color: appTheme.black,
fontWeight: FontWeight.w700,
);
static get titleSmallBluegray800ExtraBold => theme.textTheme.titleSmall!.copyWith(
color: appTheme.blueGray800,
color: appTheme.black,
fontWeight: FontWeight.w800,
);
@@ -165,8 +165,6 @@ class CustomTextStyles {
static get titleSmallSegoeUIOnPrimary => theme.textTheme.titleSmall!.segoeUI.copyWith(
color: theme.colorScheme.onPrimary,
);
}
extension on TextStyle {
@@ -179,4 +177,52 @@ extension on TextStyle {
}
}
abstract class TextStyles {
static const headingXLSemibold = TextStyle(
fontSize: 20,
fontWeight: FontWeight.w600,
height: 1.255,
);
static const textLSemibold = TextStyle(
fontSize: 18,
fontWeight: FontWeight.w600,
height: 1.255,
);
static const textMSemibold = TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
height: 1.255,
);
static const textMMedium = TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
height: 1,
);
static const textMMediumAuto = TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
height: 1.255,
);
static const textSSemibold = TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
height: 1.255,
);
static const textSMedium = TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500,
height: 1.255,
);
static const textXSSemibold = TextStyle(
fontSize: 12,
fontWeight: FontWeight.w500,
height: 1.255,
);
}

View File

@@ -114,7 +114,7 @@ class PrimaryColors {
// BlueGray
Color get blueGray300 => Color(0XFF9AA5B1);
Color get blueGray800 => Color(0XFF323F4B);
Color get black => Color(0XFF323F4B);
Color get blueGray900 => Color(0XFF2A2F4C);
@@ -169,9 +169,13 @@ class PrimaryColors {
Color get dividerColor => Color(0xFFF1F2F6);
Color get grey => Color(0xFF6D6F71);
Color get gray => Color(0xFF6D6F71);
Color get lightGrey => Color(0xFFCECECE);
Color get lightGray600 => Color(0xFFB0B0B0);
Color get lightGray => Color(0xFFCECECE);
Color get transparentBlue => Color(0xFF2F80ED).withOpacity(0.1);
}
PrimaryColors get appTheme => ThemeHelper().themeColor();