From b0f8057aa089545a3c7f91aa432a3a4a3310d33d Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 14 Oct 2024 18:41:05 +0300 Subject: [PATCH] feat(profile): --- .../presentation/pages/profile_screen.dart | 125 +++++++++++------- 1 file changed, 74 insertions(+), 51 deletions(-) diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart index b62c2ec4..7c61c915 100644 --- a/lib/features/profile/presentation/pages/profile_screen.dart +++ b/lib/features/profile/presentation/pages/profile_screen.dart @@ -1,4 +1,3 @@ -import 'package:eatvio_app/core/const.dart'; import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart'; import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_widget.dart'; import 'package:eatvio_app/features/profile/models/circumference_model.dart'; @@ -12,10 +11,8 @@ import 'package:eatvio_app/locator_service.dart'; import 'package:eatvio_app/theme/theme_helper.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_svg/flutter_svg.dart'; import 'package:go_router/go_router.dart'; import 'package:rive/rive.dart'; -import 'package:share_plus/share_plus.dart'; class ProfileScreen extends StatefulWidget { final Author? author; @@ -78,68 +75,94 @@ class _ProfileScreenState extends State { backgroundImage: NetworkImage(state.profile.profilePhotoUrl), ), const SizedBox(width: 12), - Text( - state.profile.name, - style: TextStyle( - color: Colors.black, - fontWeight: FontWeight.w500, - height: 1, - ), - ), - const Spacer(), - Row( - mainAxisAlignment: MainAxisAlignment.end, - crossAxisAlignment: CrossAxisAlignment.center, + Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - child: SvgPicture.asset( - height: 28, - width: 28, - 'assets/icons/subscribers.svg', - colorFilter: ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn), + Text( + state.profile.name, + style: TextStyle( + color: Colors.black, + fontWeight: FontWeight.w500, + height: 1, ), ), - SizedBox(width: 8), - Column( + const SizedBox(height: 8), + Row( children: [ - Text( - '123', - style: TextStyle( - height: 1, - fontSize: 18, - fontWeight: FontWeight.w500, - color: Colors.black87, - ), + Icon( + Icons.info_outline, + size: 20, + color: Color(0xFF6D6F71), ), + const SizedBox(width: 4), Text( - 'Подписчика', + 'Дополнительно', style: TextStyle( - height: 1, - fontSize: 12, - fontWeight: FontWeight.w400, - color: Colors.black38, + color: Color(0xFF6D6F71), ), ), ], ), ], ), - GestureDetector( - onTap: () => Share.shareUri( - Uri.parse( - baseUrl + '/ru/profile/' + state.profile.slug, - ), - ), - child: Container( - padding: EdgeInsets.only(left: 16), - child: SvgPicture.asset( - height: 24, - width: 24, - 'assets/icons/share.svg', - colorFilter: ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn), - ), - ), + const Spacer(), + IconButton( + onPressed: () {}, + icon: Icon(Icons.more_horiz_rounded), ), + // Row( + // mainAxisAlignment: MainAxisAlignment.end, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // Container( + // child: SvgPicture.asset( + // height: 28, + // width: 28, + // 'assets/icons/subscribers.svg', + // colorFilter: ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn), + // ), + // ), + // SizedBox(width: 8), + // Column( + // children: [ + // Text( + // '123', + // style: TextStyle( + // height: 1, + // fontSize: 18, + // fontWeight: FontWeight.w500, + // color: Colors.black87, + // ), + // ), + // Text( + // 'Подписчика', + // style: TextStyle( + // height: 1, + // fontSize: 12, + // fontWeight: FontWeight.w400, + // color: Colors.black38, + // ), + // ), + // ], + // ), + // ], + // ), + // GestureDetector( + // onTap: () => Share.shareUri( + // Uri.parse( + // baseUrl + '/ru/profile/' + state.profile.slug, + // ), + // ), + // child: Container( + // padding: EdgeInsets.only(left: 16), + // child: SvgPicture.asset( + // height: 24, + // width: 24, + // 'assets/icons/share.svg', + // colorFilter: ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn), + // ), + // ), + // ), ], ), ),