diff --git a/assets/images/image_not_found copy.png b/assets/images/image_not_found copy.png new file mode 100644 index 00000000..840d828d Binary files /dev/null and b/assets/images/image_not_found copy.png differ diff --git a/assets/images/img_.png b/assets/images/img_.png new file mode 100644 index 00000000..2549f138 Binary files /dev/null and b/assets/images/img_.png differ diff --git a/assets/images/img_area_1.svg b/assets/images/img_area_1.svg new file mode 100644 index 00000000..1b6e7270 --- /dev/null +++ b/assets/images/img_area_1.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_arrow_left copy.svg b/assets/images/img_arrow_left copy.svg new file mode 100644 index 00000000..686dc1ab --- /dev/null +++ b/assets/images/img_arrow_left copy.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_close.svg b/assets/images/img_close.svg new file mode 100644 index 00000000..821eccd7 --- /dev/null +++ b/assets/images/img_close.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_close_blue_gray_900.svg b/assets/images/img_close_blue_gray_900.svg new file mode 100644 index 00000000..b0a23bbc --- /dev/null +++ b/assets/images/img_close_blue_gray_900.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_crop.svg b/assets/images/img_crop.svg new file mode 100644 index 00000000..6a6b5b87 --- /dev/null +++ b/assets/images/img_crop.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/img_edit.svg b/assets/images/img_edit.svg new file mode 100644 index 00000000..e7cafed1 --- /dev/null +++ b/assets/images/img_edit.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/img_ellipse_1.png b/assets/images/img_ellipse_1.png new file mode 100644 index 00000000..21c05917 Binary files /dev/null and b/assets/images/img_ellipse_1.png differ diff --git a/assets/images/img_ellipse_1_1.png b/assets/images/img_ellipse_1_1.png new file mode 100644 index 00000000..bb5e76a3 Binary files /dev/null and b/assets/images/img_ellipse_1_1.png differ diff --git a/assets/images/img_ellipse_1_25x25.png b/assets/images/img_ellipse_1_25x25.png new file mode 100644 index 00000000..e31c4356 Binary files /dev/null and b/assets/images/img_ellipse_1_25x25.png differ diff --git a/assets/images/img_ellipse_1_32x32.png b/assets/images/img_ellipse_1_32x32.png new file mode 100644 index 00000000..ca0a1bbe Binary files /dev/null and b/assets/images/img_ellipse_1_32x32.png differ diff --git a/assets/images/img_ellipse_1_34x34.png b/assets/images/img_ellipse_1_34x34.png new file mode 100644 index 00000000..ef2f13f8 Binary files /dev/null and b/assets/images/img_ellipse_1_34x34.png differ diff --git a/assets/images/img_ellipse_1_42x42.png b/assets/images/img_ellipse_1_42x42.png new file mode 100644 index 00000000..665db966 Binary files /dev/null and b/assets/images/img_ellipse_1_42x42.png differ diff --git a/assets/images/img_ellipse_2.png b/assets/images/img_ellipse_2.png new file mode 100644 index 00000000..89021c44 Binary files /dev/null and b/assets/images/img_ellipse_2.png differ diff --git a/assets/images/img_ellipse_3.png b/assets/images/img_ellipse_3.png new file mode 100644 index 00000000..3e8a0760 Binary files /dev/null and b/assets/images/img_ellipse_3.png differ diff --git a/assets/images/img_eye.svg b/assets/images/img_eye.svg new file mode 100644 index 00000000..385ec8b0 --- /dev/null +++ b/assets/images/img_eye.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_favorite copy.svg b/assets/images/img_favorite copy.svg new file mode 100644 index 00000000..43cfd6e1 --- /dev/null +++ b/assets/images/img_favorite copy.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_favorite_white_a700.svg b/assets/images/img_favorite_white_a700.svg new file mode 100644 index 00000000..f5e05ea0 --- /dev/null +++ b/assets/images/img_favorite_white_a700.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_grid.svg b/assets/images/img_grid.svg new file mode 100644 index 00000000..49132101 --- /dev/null +++ b/assets/images/img_grid.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_icon_heart.svg b/assets/images/img_icon_heart.svg new file mode 100644 index 00000000..7dce386f --- /dev/null +++ b/assets/images/img_icon_heart.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_icon_message_square.svg b/assets/images/img_icon_message_square.svg new file mode 100644 index 00000000..89dced25 --- /dev/null +++ b/assets/images/img_icon_message_square.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_icon_more_horizontal.svg b/assets/images/img_icon_more_horizontal.svg new file mode 100644 index 00000000..6c168c82 --- /dev/null +++ b/assets/images/img_icon_more_horizontal.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/img_icon_share_2.svg b/assets/images/img_icon_share_2.svg new file mode 100644 index 00000000..137c94b8 --- /dev/null +++ b/assets/images/img_icon_share_2.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/img_like_5.svg b/assets/images/img_like_5.svg new file mode 100644 index 00000000..f07fbfaf --- /dev/null +++ b/assets/images/img_like_5.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/images/img_like_6.svg b/assets/images/img_like_6.svg new file mode 100644 index 00000000..1124613c --- /dev/null +++ b/assets/images/img_like_6.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/img_line_1.svg b/assets/images/img_line_1.svg new file mode 100644 index 00000000..2928b086 --- /dev/null +++ b/assets/images/img_line_1.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_line_2.svg b/assets/images/img_line_2.svg new file mode 100644 index 00000000..e353d487 --- /dev/null +++ b/assets/images/img_line_2.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_line_3.svg b/assets/images/img_line_3.svg new file mode 100644 index 00000000..3aa093a6 --- /dev/null +++ b/assets/images/img_line_3.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_megaphone.svg b/assets/images/img_megaphone.svg new file mode 100644 index 00000000..b1b1ac78 --- /dev/null +++ b/assets/images/img_megaphone.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/img_nav.svg b/assets/images/img_nav.svg new file mode 100644 index 00000000..e456300f --- /dev/null +++ b/assets/images/img_nav.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/images/img_nav_blue_gray_400.svg b/assets/images/img_nav_blue_gray_400.svg new file mode 100644 index 00000000..3816ee25 --- /dev/null +++ b/assets/images/img_nav_blue_gray_400.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_nav_blue_gray_400_24x23.svg b/assets/images/img_nav_blue_gray_400_24x23.svg new file mode 100644 index 00000000..28bc4a42 --- /dev/null +++ b/assets/images/img_nav_blue_gray_400_24x23.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/img_nav_blue_gray_400_24x25.svg b/assets/images/img_nav_blue_gray_400_24x25.svg new file mode 100644 index 00000000..f24329d6 --- /dev/null +++ b/assets/images/img_nav_blue_gray_400_24x25.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/img_nav_primary.svg b/assets/images/img_nav_primary.svg new file mode 100644 index 00000000..65027e80 --- /dev/null +++ b/assets/images/img_nav_primary.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_overflowmenu.svg b/assets/images/img_overflowmenu.svg new file mode 100644 index 00000000..8f65bc76 --- /dev/null +++ b/assets/images/img_overflowmenu.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/img_rectangle_14.png b/assets/images/img_rectangle_14.png new file mode 100644 index 00000000..fc5220ab Binary files /dev/null and b/assets/images/img_rectangle_14.png differ diff --git a/assets/images/img_rectangle_14_220x341.png b/assets/images/img_rectangle_14_220x341.png new file mode 100644 index 00000000..c5576698 Binary files /dev/null and b/assets/images/img_rectangle_14_220x341.png differ diff --git a/assets/images/img_rectangle_14_220x375.png b/assets/images/img_rectangle_14_220x375.png new file mode 100644 index 00000000..f17e692a Binary files /dev/null and b/assets/images/img_rectangle_14_220x375.png differ diff --git a/assets/images/img_rectangle_14_250x311.png b/assets/images/img_rectangle_14_250x311.png new file mode 100644 index 00000000..9d37ab49 Binary files /dev/null and b/assets/images/img_rectangle_14_250x311.png differ diff --git a/assets/images/img_search.svg b/assets/images/img_search.svg new file mode 100644 index 00000000..589cb1c7 --- /dev/null +++ b/assets/images/img_search.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/img_send_1.svg b/assets/images/img_send_1.svg new file mode 100644 index 00000000..30ae3a66 --- /dev/null +++ b/assets/images/img_send_1.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/assets/images/img_statistic.svg b/assets/images/img_statistic.svg new file mode 100644 index 00000000..0d4b6868 --- /dev/null +++ b/assets/images/img_statistic.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/img_statistic_gray_200.svg b/assets/images/img_statistic_gray_200.svg new file mode 100644 index 00000000..35849df9 --- /dev/null +++ b/assets/images/img_statistic_gray_200.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/images/img_vector.svg b/assets/images/img_vector.svg new file mode 100644 index 00000000..211ce67c --- /dev/null +++ b/assets/images/img_vector.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart b/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart index 13af58a4..1bd2b992 100644 --- a/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart +++ b/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart @@ -5,7 +5,7 @@ import 'package:eatvio_app/presentation/profile/my_profile_screen/models/my_prof part 'my_profile_event.dart'; part 'my_profile_state.dart'; -/// A bloc that manages the state of a K0 according to the event that is dispatched to it. +/// A bloc that manages the state of a MyProfile according to the event that is dispatched to it. class MyProfileBloc extends Bloc { MyProfileBloc(MyProfileState initialState) : super(initialState) { on(_onInitialize); diff --git a/lib/presentation/profile/my_profile_screen/bloc/my_profile_event.dart b/lib/presentation/profile/my_profile_screen/bloc/my_profile_event.dart index 33768c28..99c025a4 100644 --- a/lib/presentation/profile/my_profile_screen/bloc/my_profile_event.dart +++ b/lib/presentation/profile/my_profile_screen/bloc/my_profile_event.dart @@ -3,13 +3,13 @@ part of 'my_profile_bloc.dart'; /// Abstract class for all events that can be dispatched from the -///K0 widget. +///MyProfile widget. /// /// Events must be immutable and implement the [Equatable] interface. @immutable abstract class MyProfileEvent extends Equatable {} -/// Event that is dispatched when the K0 widget is first created. +/// Event that is dispatched when the MyProfile widget is first created. class MyProfileInitialEvent extends MyProfileEvent { @override List get props => []; diff --git a/lib/presentation/profile/my_profile_screen/bloc/my_profile_state.dart b/lib/presentation/profile/my_profile_screen/bloc/my_profile_state.dart index 541c1934..69dbaaa5 100644 --- a/lib/presentation/profile/my_profile_screen/bloc/my_profile_state.dart +++ b/lib/presentation/profile/my_profile_screen/bloc/my_profile_state.dart @@ -2,7 +2,7 @@ part of 'my_profile_bloc.dart'; -/// Represents the state of K0 in the application. +/// Represents the state of MyProfile in the application. class MyProfileState extends Equatable { MyProfileState({this.k0ModelObj}); diff --git a/lib/presentation/profile/my_profile_screen/models/my_profile_model.dart b/lib/presentation/profile/my_profile_screen/models/my_profile_model.dart index 42b3f2a6..ae803e19 100644 --- a/lib/presentation/profile/my_profile_screen/models/my_profile_model.dart +++ b/lib/presentation/profile/my_profile_screen/models/my_profile_model.dart @@ -5,7 +5,7 @@ import 'package:equatable/equatable.dart'; /// This class defines the variables used in the [k0_page], /// and is typically used to hold data that is passed between different parts of the application. class MyProfileModel extends Equatable { - MyProfileModel() {} + MyProfileModel(); MyProfileModel copyWith() { return MyProfileModel(); diff --git a/lib/presentation/profile/my_profile_screen/my_profile_screen.dart b/lib/presentation/profile/my_profile_screen/my_profile_screen.dart index b8c50bd8..f8c0bcf2 100644 --- a/lib/presentation/profile/my_profile_screen/my_profile_screen.dart +++ b/lib/presentation/profile/my_profile_screen/my_profile_screen.dart @@ -1,11 +1,12 @@ +import 'bloc/my_profile_bloc.dart'; +import 'models/my_profile_model.dart'; import 'package:eatvio_app/core/app_export.dart'; import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart'; +import 'package:eatvio_app/widgets/app_bar/appbar_subtitle.dart'; +import 'package:eatvio_app/widgets/app_bar/appbar_title_circleimage.dart'; import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart'; import 'package:eatvio_app/widgets/custom_outlined_button.dart'; -import 'package:eatvio_app/widgets/app_bar/appbar_title_circleimage.dart'; -import 'package:eatvio_app/widgets/app_bar/appbar_subtitle.dart'; import 'package:flutter/material.dart'; -import 'bloc/my_profile_bloc.dart'; class MyProfileScreen extends StatelessWidget { const MyProfileScreen({Key? key}) : super(key: key); @@ -13,28 +14,33 @@ class MyProfileScreen extends StatelessWidget { static Widget builder(BuildContext context) { return BlocProvider( create: (context) => - MyProfileBloc(MyProfileState())..add(MyProfileInitialEvent()), + MyProfileBloc(MyProfileState(k0ModelObj: MyProfileModel())) + ..add(MyProfileInitialEvent()), child: MyProfileScreen()); } @override Widget build(BuildContext context) { - return SafeArea( - child: Scaffold( - appBar: _buildAppBar(context), - body: Container( - width: double.maxFinite, - padding: EdgeInsets.symmetric(horizontal: 8.h, vertical: 18.v), - child: Column(children: [ - _buildMyBlog(context), - SizedBox(height: 15.v), - _buildSettings(context), - SizedBox(height: 30.v), - _buildAreaChart(context), - SizedBox(height: 15.v), - _buildWidget(context), - SizedBox(height: 5.v) - ])))); + return BlocBuilder( + builder: (context, state) { + return SafeArea( + child: Scaffold( + appBar: _buildAppBar(context), + body: Container( + width: double.maxFinite, + padding: + EdgeInsets.symmetric(horizontal: 8.h, vertical: 18.v), + child: Column(children: [ + _buildMyBlog(context), + SizedBox(height: 15.v), + _buildSettings(context), + SizedBox(height: 30.v), + _buildAreaChart(context), + SizedBox(height: 15.v), + _buildWidget(context), + SizedBox(height: 5.v) + ])))); + }); } /// Section Widget @@ -53,12 +59,12 @@ class MyProfileScreen extends StatelessWidget { child: Row(children: [ AppbarTitleCircleimage(imagePath: ImageConstant.imgEllipse1), AppbarSubtitle( - text: "Дмитрий Коваль", + text: "lbl".tr, margin: EdgeInsets.only(left: 35.h, top: 12.v, bottom: 9.v)) ])), actions: [ AppbarSubtitle( - text: "Выйти", + text: "lbl2".tr, margin: EdgeInsets.symmetric(horizontal: 16.h, vertical: 17.v)) ]); } @@ -75,7 +81,7 @@ class MyProfileScreen extends StatelessWidget { margin: EdgeInsets.symmetric(vertical: 3.v)), Expanded( child: CustomOutlinedButton( - text: "Мой блог".toUpperCase(), + text: "lbl3".tr.toUpperCase(), margin: EdgeInsets.only(left: 10.h))) ])); } @@ -92,7 +98,7 @@ class MyProfileScreen extends StatelessWidget { margin: EdgeInsets.symmetric(vertical: 3.v)), Expanded( child: CustomOutlinedButton( - text: "Настройки".toUpperCase(), + text: "lbl4".tr.toUpperCase(), margin: EdgeInsets.only(left: 10.h))) ])); } @@ -107,16 +113,17 @@ class MyProfileScreen extends StatelessWidget { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text("Вес:", style: CustomTextStyles.titleSmallBluegray800), + Text("lbl5".tr, + style: CustomTextStyles.titleSmallBluegray800), Row(mainAxisAlignment: MainAxisAlignment.center, children: [ RichText( text: TextSpan(children: [ TextSpan( - text: "Было:", + text: "lbl6".tr, style: CustomTextStyles.bodyMediumBluegray800_1), TextSpan( - text: " 80", + text: "lbl_802".tr, style: CustomTextStyles .titleSmallBluegray800ExtraBold) ]), @@ -126,11 +133,11 @@ class MyProfileScreen extends StatelessWidget { child: RichText( text: TextSpan(children: [ TextSpan( - text: "Стало:", + text: "lbl7".tr, style: CustomTextStyles .bodyMediumBluegray800_1), TextSpan( - text: " 55", + text: "lbl_552".tr, style: CustomTextStyles .titleSmallBluegray800ExtraBold) ]), @@ -144,7 +151,8 @@ class MyProfileScreen extends StatelessWidget { child: Stack(alignment: Alignment.centerLeft, children: [ Align( alignment: Alignment.bottomRight, - child: Text("01.04.21", style: theme.textTheme.bodySmall)), + child: Text("lbl_01_04_21".tr, + style: theme.textTheme.bodySmall)), Align( alignment: Alignment.centerLeft, child: Row( @@ -156,7 +164,9 @@ class MyProfileScreen extends StatelessWidget { children: [ Row(children: [ _buildLineChart(context, - text100: "100", text50: "50", text0: "0"), + text100: "lbl_100".tr, + text50: "lbl_50".tr, + text0: "lbl_0".tr), Expanded( child: Padding( padding: EdgeInsets.only( @@ -244,13 +254,13 @@ class MyProfileScreen extends StatelessWidget { margin: EdgeInsets.only(left: 8.h, right: 82.h), child: Row(children: [ - Text("01.01.21", + Text("lbl_01_01_21".tr, style: theme.textTheme.bodySmall), Spacer(flex: 49), - Text("01.02.21", + Text("lbl_01_02_21".tr, style: theme.textTheme.bodySmall), Spacer(flex: 50), - Text("01.03.21", + Text("lbl_01_03_21".tr, style: theme.textTheme.bodySmall) ])) ])), @@ -268,16 +278,17 @@ class MyProfileScreen extends StatelessWidget { padding: EdgeInsets.only(right: 7.h), child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ - Text("Обхват:", style: CustomTextStyles.titleSmallBluegray800), + Text("lbl8".tr, style: CustomTextStyles.titleSmallBluegray800), Spacer(), RichText( text: TextSpan(children: [ TextSpan( - text: "Грудь:", + text: "lbl9".tr, style: CustomTextStyles.bodyMediumBluegray800_1), TextSpan(text: " "), TextSpan( - text: "90", style: CustomTextStyles.titleSmallRed200) + text: "lbl_902".tr, + style: CustomTextStyles.titleSmallRed200) ]), textAlign: TextAlign.left), Padding( @@ -285,11 +296,11 @@ class MyProfileScreen extends StatelessWidget { child: RichText( text: TextSpan(children: [ TextSpan( - text: "Талия:", + text: "lbl10".tr, style: CustomTextStyles.bodyMediumBluegray800_1), TextSpan(text: " "), TextSpan( - text: "60", + text: "lbl_602".tr, style: CustomTextStyles.titleSmallBlue800) ]), textAlign: TextAlign.left)), @@ -298,11 +309,11 @@ class MyProfileScreen extends StatelessWidget { child: RichText( text: TextSpan(children: [ TextSpan( - text: "Бедра:", + text: "lbl11".tr, style: CustomTextStyles.bodyMediumBluegray800_1), TextSpan(text: " "), TextSpan( - text: "90", + text: "lbl_902".tr, style: CustomTextStyles.titleSmallLightgreen300) ]), textAlign: TextAlign.left)) @@ -313,7 +324,9 @@ class MyProfileScreen extends StatelessWidget { padding: EdgeInsets.only(right: 15.h), child: Row(children: [ _buildLineChart(context, - text100: "100", text50: "50", text0: "0"), + text100: "lbl_100".tr, + text50: "lbl_50".tr, + text0: "lbl_0".tr), Expanded( child: Padding( padding: @@ -620,11 +633,11 @@ class MyProfileScreen extends StatelessWidget { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text("01.01.21", style: theme.textTheme.bodySmall), - Text("01.02.21", style: theme.textTheme.bodySmall), - Text("01.03.21", style: theme.textTheme.bodySmall), - Text("01.04.21", style: theme.textTheme.bodySmall), - Text("01.05.21", style: theme.textTheme.bodySmall) + Text("lbl_01_01_21".tr, style: theme.textTheme.bodySmall), + Text("lbl_01_02_21".tr, style: theme.textTheme.bodySmall), + Text("lbl_01_03_21".tr, style: theme.textTheme.bodySmall), + Text("lbl_01_04_21".tr, style: theme.textTheme.bodySmall), + Text("lbl_01_05_21".tr, style: theme.textTheme.bodySmall) ])) ]) ])); @@ -637,7 +650,7 @@ class MyProfileScreen extends StatelessWidget { child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ Padding( padding: EdgeInsets.only(left: 15.h), - child: Text("Пройденные планы:", + child: Text("msg".tr, style: CustomTextStyles.titleSmallBluegray800)), SizedBox(height: 3.v), SizedBox( @@ -667,7 +680,7 @@ class MyProfileScreen extends StatelessWidget { Padding( padding: EdgeInsets.only( left: 38.h, bottom: 1.v), - child: Text("Лёгкий", + child: Text("lbl12".tr, style: CustomTextStyles .titleSmallBluegray800Bold)), Container( @@ -683,7 +696,7 @@ class MyProfileScreen extends StatelessWidget { child: Container( width: 40.h, margin: EdgeInsets.only(right: 30.h), - child: Text("Готово", + child: Text("lbl13".tr, maxLines: 2, overflow: TextOverflow.ellipsis, style: theme.textTheme.titleSmall))) @@ -712,7 +725,7 @@ class MyProfileScreen extends StatelessWidget { Padding( padding: EdgeInsets.only( left: 38.h, top: 1.v), - child: Text("Умеренный", + child: Text("lbl14".tr, style: CustomTextStyles .titleSmallBluegray800Bold)), Container( @@ -728,7 +741,7 @@ class MyProfileScreen extends StatelessWidget { child: Container( width: 40.h, margin: EdgeInsets.only(right: 30.h), - child: Text("Готово", + child: Text("lbl13".tr, maxLines: 2, overflow: TextOverflow.ellipsis, style: theme.textTheme.titleSmall))) @@ -747,7 +760,7 @@ class MyProfileScreen extends StatelessWidget { Padding( padding: EdgeInsets.only(left: 38.h, bottom: 2.v), - child: Text("Полный", + child: Text("lbl15".tr, style: CustomTextStyles .titleSmallBluegray800Bold)), SizedBox( @@ -769,7 +782,7 @@ class MyProfileScreen extends StatelessWidget { 5.h)))), Align( alignment: Alignment.bottomCenter, - child: Text("В процессе", + child: Text("lbl16".tr, style: theme.textTheme.titleSmall)) ])) @@ -826,8 +839,8 @@ class MyProfileScreen extends StatelessWidget { ]); } - /// Navigates back to the previous screen. + /// Navigates to the previous screen. onTapArrowLeft(BuildContext context) { - Navigator.pop(context); + NavigatorService.goBack(); } } diff --git a/lib/presentation/registration/language_select_screen/language_select_screen.dart b/lib/presentation/registration/language_select_screen/language_select_screen.dart index 9bae529d..6c57b233 100644 --- a/lib/presentation/registration/language_select_screen/language_select_screen.dart +++ b/lib/presentation/registration/language_select_screen/language_select_screen.dart @@ -82,7 +82,18 @@ class LanguageSelectScreen extends StatelessWidget { .add(ChangeDropDownEvent(value: value)); }); }), - Spacer(flex: 63) + Spacer(flex: 63), + NextStepButton( + text: "тест профиля".toUpperCase(), + margin: EdgeInsets.only( + left: 16.h, right: 16.h, bottom: 50.v), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, + onPressed: () { + Navigator.pushNamed( + context, + AppRoutes.myProfile, + ); + }), ])), bottomNavigationBar: BlocBuilder(