Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Username1548
2025-04-29 14:46:46 +07:00
37 changed files with 367 additions and 2768 deletions

View File

@@ -81,6 +81,7 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
foregroundImage: NetworkImage(
state.feedBlogPostList[widget.index].author.authorProfileIcon,
),
backgroundImage: const AssetImage('assets/images/no_avatar.png'),
),
const SizedBox(width: 8),
Column(

View File

@@ -42,6 +42,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
),
const SizedBox(height: 8),
],
const SizedBox(height: 48),
],
);
}
@@ -60,6 +61,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
children: [
CircleAvatar(
foregroundImage: NetworkImage(comment.authorProfileIcon),
backgroundImage: const AssetImage('assets/images/no_avatar.png'),
radius: radius,
),
const SizedBox(width: 8),

View File

@@ -64,6 +64,7 @@ class ConsultantWidget extends StatelessWidget {
const SizedBox(width: 8),
CircleAvatar(
foregroundImage: NetworkImage(consultant.photo),
backgroundImage: const AssetImage('assets/images/no_avatar.png'),
),
const SizedBox(width: 8),
Column(
@@ -80,7 +81,7 @@ class ConsultantWidget extends StatelessWidget {
),
const SizedBox(height: 4),
Text(
'Рейтинг: RATING',
'Рейтинг: ${consultant.totalScores}',
style: TextStyle(
color: appTheme.blueA400,
height: 1,
@@ -105,7 +106,10 @@ class ConsultantWidget extends StatelessWidget {
],
),
const SizedBox(height: 8),
const Text('description'),
Text(
consultant.description,
maxLines: 2,
),
if (consultant.badges.isNotEmpty) const SizedBox(height: 8),
_badges(consultant.badges, context),
],

View File

@@ -153,6 +153,19 @@ class _DietsWidgetState extends State<DietsWidget> {
),
),
],
if (widget.diet.details.length > 200)
const Padding(
padding: EdgeInsets.only(left: 16, top: 8),
child: Text(
'Показать ещё',
style: TextStyle(
height: 1,
color: Color(0xFF8B8B8B),
fontSize: 14,
fontWeight: FontWeight.w600,
),
),
),
],
),
Padding(

View File

@@ -156,6 +156,19 @@ class _PlanWidgetState extends State<PlanWidget> {
},
),
),
if (widget.plan.details.length > 200)
const Padding(
padding: EdgeInsets.only(left: 16, top: 8),
child: Text(
'Показать ещё',
style: TextStyle(
height: 1,
color: Color(0xFF8B8B8B),
fontSize: 14,
fontWeight: FontWeight.w600,
),
),
),
],
],
),

View File

@@ -187,7 +187,7 @@ class _RecipesWidgetState extends State<RecipesWidget> {
),
if (widget.recipe.description.length > 200)
const Padding(
padding: EdgeInsets.symmetric(horizontal: 12),
padding: EdgeInsets.only(left: 16, top: 8),
child: Text(
'Показать ещё',
style: TextStyle(