Обновлен проект. Добавлена БД
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
// Flutter imports:
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
|
||||
// Package imports:
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
import 'package:remever/common/resources.dart';
|
||||
import 'package:remever/components/extensions/context.dart';
|
||||
|
||||
export '../../common/typography.dart';
|
||||
|
||||
@@ -31,6 +32,7 @@ abstract class TypographyTypeRegular extends TypographyType {
|
||||
fontWeight: FontWeight.w400,
|
||||
fontSize: size.sp,
|
||||
height: height,
|
||||
color: AppColors.text_black,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -47,6 +49,7 @@ abstract class TypographyTypeMedium extends TypographyType {
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: size.sp,
|
||||
height: height,
|
||||
color: AppColors.text_black,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -63,6 +66,7 @@ abstract class TypographyTypeSemiBold extends TypographyType {
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: size.sp,
|
||||
height: height,
|
||||
color: AppColors.text_black,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -79,6 +83,7 @@ abstract class TypographyTypeBold extends TypographyType {
|
||||
fontWeight: FontWeight.w700,
|
||||
fontSize: size.sp,
|
||||
height: height,
|
||||
color: AppColors.text_black,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -95,6 +100,7 @@ abstract class TypographyTypeHeadBold extends TypographyType {
|
||||
fontWeight: FontWeight.w700,
|
||||
fontSize: size.sp,
|
||||
height: height,
|
||||
color: AppColors.text_black,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -218,7 +224,7 @@ class AppTypography extends StatelessWidget {
|
||||
type == null
|
||||
? textStyle.style
|
||||
: type!.style.copyWith(
|
||||
color: color ?? textStyle.style.color,
|
||||
color: color ?? Colors.black,
|
||||
fontWeight: fontWeight,
|
||||
height: height,
|
||||
decoration: textDecoration,
|
||||
|
||||
Reference in New Issue
Block a user