From 47847438d776095e65302ef0b98c588dda2d8fa9 Mon Sep 17 00:00:00 2001 From: BLoC Date: Wed, 5 Mar 2025 11:13:20 +0300 Subject: [PATCH 1/4] feat: text styles --- .../arm64-v8a/configure_fingerprint.bin | 24 +++++++++---------- .../armeabi-v7a/configure_fingerprint.bin | 24 +++++++++---------- .../5y6c3x6h/x86/configure_fingerprint.bin | 24 +++++++++---------- .../5y6c3x6h/x86_64/configure_fingerprint.bin | 24 +++++++++---------- lib/core/theme/text_styles.dart | 17 +++++++++++++ .../stepper_become_consultant_screen.dart | 7 ++---- .../widgets/consultation_card_widget.dart | 7 ++---- .../presentation/widgets/add_meal_widget.dart | 7 ++---- .../widgets/add_product_modal.dart | 7 ++---- ...ssary_moderation_request_modal_widget.dart | 19 ++++----------- .../widgets/consultant_widget.dart | 7 ++---- .../presentation/pages/profile_screen.dart | 9 ++----- .../widgets/ingredients_widget.dart | 13 +++------- .../presentation/widgets/steps_widget.dart | 7 ++---- 14 files changed, 86 insertions(+), 110 deletions(-) diff --git a/android/app/.cxx/Debug/5y6c3x6h/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/Debug/5y6c3x6h/arm64-v8a/configure_fingerprint.bin index 51cc237b..c7247238 100644 --- a/android/app/.cxx/Debug/5y6c3x6h/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/5y6c3x6h/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2` +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2` ^ -\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\android_gradle_build.json  2 2e +\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\android_gradle_build.json  2 2e c -aC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\android_gradle_build_mini.json  2 2R +aC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\android_gradle_build_mini.json  2 2R P -NC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build.ninja  2 2V +NC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build.ninja  2 2V T -RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build.ninja.txt  2[ +RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build.ninja.txt  2[ Y -WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build_file_index.txt  2 R 2\ +WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build_file_index.txt  2 R 2\ Z -XC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\compile_commands.json  2` +XC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\compile_commands.json  2` ^ -\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\compile_commands.json.bin  2 f +\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\compile_commands.json.bin  2 f d -bC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\metadata_generation_command.txt  2 +bC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\metadata_generation_command.txt  2  2Y W -UC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\prefab_config.json  2  ( 2^ +UC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\prefab_config.json  2  ( 2^ \ -ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\symbol_folder_index.txt  2  Q 2V +ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\symbol_folder_index.txt  2  Q 2V T -RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file +RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/5y6c3x6h/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/Debug/5y6c3x6h/armeabi-v7a/configure_fingerprint.bin index 557aff8a..8d749dc5 100644 --- a/android/app/.cxx/Debug/5y6c3x6h/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/5y6c3x6h/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Loge c aC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  ɓ2b +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  ɓ2b ` -^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\android_gradle_build.json  2 ɓ2g +^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\android_gradle_build.json  2 ɓ2g e -cC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\android_gradle_build_mini.json  2 ɓ2T +cC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\android_gradle_build_mini.json  2 ɓ2T R -PC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build.ninja  2 ȓ2X +PC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build.ninja  2 ȓ2X V -TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build.ninja.txt  2] +TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build.ninja.txt  2] [ -YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build_file_index.txt  2 R ɓ2^ +YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build_file_index.txt  2 R ɓ2^ \ -ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\compile_commands.json  2b +ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\compile_commands.json  2b ` -^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\compile_commands.json.bin  2 h +^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\compile_commands.json.bin  2 h f -dC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\metadata_generation_command.txt  2 +dC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\metadata_generation_command.txt  2  ɓ2[ Y -WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\prefab_config.json  2  ( ɓ2` +WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\prefab_config.json  2  ( ɓ2` ^ -\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\symbol_folder_index.txt  2  S ɓ2V +\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\symbol_folder_index.txt  2  S ɓ2V T -RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file +RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/5y6c3x6h/x86/configure_fingerprint.bin b/android/app/.cxx/Debug/5y6c3x6h/x86/configure_fingerprint.bin index 740fa00d..e71374d0 100644 --- a/android/app/.cxx/Debug/5y6c3x6h/x86/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/5y6c3x6h/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log] [ YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2Z +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2Z X -VC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\android_gradle_build.json  2 2_ +VC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\android_gradle_build.json  2 2_ ] -[C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\android_gradle_build_mini.json  2 2L +[C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\android_gradle_build_mini.json  2 2L J -HC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build.ninja  2 2P +HC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build.ninja  2 2P N -LC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build.ninja.txt  2U +LC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build.ninja.txt  2U S -QC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build_file_index.txt  2 R 2V +QC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build_file_index.txt  2 R 2V T -RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\compile_commands.json  2Z +RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\compile_commands.json  2Z X -VC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\compile_commands.json.bin  2 ` +VC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\compile_commands.json.bin  2 ` ^ -\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\metadata_generation_command.txt  2 +\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\metadata_generation_command.txt  2  2S Q -OC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\prefab_config.json  2  ( 2X +OC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\prefab_config.json  2  ( 2X V -TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\symbol_folder_index.txt  2  K 2V +TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\symbol_folder_index.txt  2  K 2V T -RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file +RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/5y6c3x6h/x86_64/configure_fingerprint.bin b/android/app/.cxx/Debug/5y6c3x6h/x86_64/configure_fingerprint.bin index bcc36e44..47ae781e 100644 --- a/android/app/.cxx/Debug/5y6c3x6h/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/5y6c3x6h/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log` ^ \C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ³2  2] +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2] [ -YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\android_gradle_build.json  ³2 2b +YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\android_gradle_build.json  2 2b ` -^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\android_gradle_build_mini.json  ³2 2O +^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\android_gradle_build_mini.json  2 2O M -KC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build.ninja  ³2 Ȍ2S +KC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build.ninja  2 Ȍ2S Q -OC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build.ninja.txt  ³2X +OC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build.ninja.txt  2X V -TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build_file_index.txt  ³2 R 2Y +TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build_file_index.txt  2 R 2Y W -UC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\compile_commands.json  ³2] +UC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\compile_commands.json  2] [ -YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\compile_commands.json.bin  ³2 c +YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\compile_commands.json.bin  2 c a -_C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\metadata_generation_command.txt  ³2 +_C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\metadata_generation_command.txt  2  2V T -RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\prefab_config.json  ³2  ( 2[ +RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\prefab_config.json  2  ( 2[ Y -WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\symbol_folder_index.txt  ³2  N 2V +WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\symbol_folder_index.txt  2  N 2V T -RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ³2  2 \ No newline at end of file +RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file diff --git a/lib/core/theme/text_styles.dart b/lib/core/theme/text_styles.dart index e69de29b..92f1eab9 100644 --- a/lib/core/theme/text_styles.dart +++ b/lib/core/theme/text_styles.dart @@ -0,0 +1,17 @@ +import 'dart:ui'; + +abstract class TextStyles { + static semiBold20([Color? color]) => TextStyle( + height: 1, + fontWeight: FontWeight.w600, + fontSize: 20, + color: color ?? Color(0xFF323F4B), + ); + + static semiBold16([Color? color]) => TextStyle( + height: 1, + fontWeight: FontWeight.w600, + fontSize: 16, + color: color ?? Color(0xFF323F4B), + ); +} diff --git a/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart index e9aa8985..5cfb4060 100644 --- a/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart +++ b/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart @@ -1,3 +1,4 @@ +import 'package:eatvio_app/core/theme/text_styles.dart'; import 'package:eatvio_app/core/utils/image_constant.dart'; import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart'; import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart'; @@ -99,11 +100,7 @@ class _StepperBecomeConsultantScreenState extends State { children: [ Text( 'Добавление блюда', - style: TextStyle( - fontSize: 20, - fontWeight: FontWeight.w600, - color: Color(0xFF323F4B), - ), + style: TextStyles.semiBold20(), ), const SizedBox(height: 16), Row( diff --git a/lib/features/diary/presentation/widgets/add_product_modal.dart b/lib/features/diary/presentation/widgets/add_product_modal.dart index 01c5a64d..13398191 100644 --- a/lib/features/diary/presentation/widgets/add_product_modal.dart +++ b/lib/features/diary/presentation/widgets/add_product_modal.dart @@ -1,4 +1,5 @@ import 'package:easy_debounce/easy_debounce.dart'; +import 'package:eatvio_app/core/theme/text_styles.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/core/widgets/custom_divider.dart'; import 'package:eatvio_app/core/widgets/custom_text_form_field.dart'; @@ -68,11 +69,7 @@ class _AddProductModalState extends State { children: [ Text( 'Добавление блюда', - style: TextStyle( - fontSize: 20, - fontWeight: FontWeight.w600, - color: Color(0xFF323F4B), - ), + style: TextStyles.semiBold20(), ), const SizedBox(height: 16), Row( diff --git a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart index 09fd00cb..3a829830 100644 --- a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart +++ b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart @@ -1,3 +1,4 @@ +import 'package:eatvio_app/core/theme/text_styles.dart'; import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/core/widgets/custom_text_form_field.dart'; @@ -55,11 +56,7 @@ class _GlossaryModerationRequestModalWidgetState extends State { const SizedBox(width: 16), Text( 'Консультант', - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w600, - color: Color( - 0xFF323F4B, - ), - ), + style: TextStyles.semiBold16(), ), const SizedBox(width: 12), if (state.profile.ratingPlace != null) diff --git a/lib/features/recipes/presentation/widgets/ingredients_widget.dart b/lib/features/recipes/presentation/widgets/ingredients_widget.dart index 3983bccf..78a78217 100644 --- a/lib/features/recipes/presentation/widgets/ingredients_widget.dart +++ b/lib/features/recipes/presentation/widgets/ingredients_widget.dart @@ -1,3 +1,4 @@ +import 'package:eatvio_app/core/theme/text_styles.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/core/widgets/custom_text_form_field.dart'; import 'package:eatvio_app/features/recipes/models/ingredient.dart'; @@ -41,11 +42,7 @@ class _IngredientsWidgetState extends State { padding: const EdgeInsets.symmetric(horizontal: 16), child: Text( 'Ингредиенты ', - style: TextStyle( - fontSize: 20, - fontWeight: FontWeight.w600, - color: Color(0xFF323F4B), - ), + style: TextStyles.semiBold20(), ), ), ReorderableListView( @@ -108,11 +105,7 @@ class _IngredientsWidgetState extends State { children: [ Text( 'Добавление ингредиента', - style: TextStyle( - fontSize: 20, - fontWeight: FontWeight.w600, - color: Color(0xFF323F4B), - ), + style: TextStyles.semiBold20(), ), const SizedBox(height: 16), SizedBox( diff --git a/lib/features/recipes/presentation/widgets/steps_widget.dart b/lib/features/recipes/presentation/widgets/steps_widget.dart index 6feb9aa6..58a9ab37 100644 --- a/lib/features/recipes/presentation/widgets/steps_widget.dart +++ b/lib/features/recipes/presentation/widgets/steps_widget.dart @@ -1,3 +1,4 @@ +import 'package:eatvio_app/core/theme/text_styles.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/core/widgets/custom_text_form_field.dart'; import 'package:eatvio_app/features/recipes/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart'; @@ -37,11 +38,7 @@ class _StepsWidgetState extends State { children: [ Text( 'Пошаговая инструкция', - style: TextStyle( - fontSize: 20, - fontWeight: FontWeight.w600, - color: Color(0xFF323F4B), - ), + style: TextStyles.semiBold20() ), const SizedBox(height: 12), ListView.separated( From c6be45c5a4972f743e81f4049adb053e19be64f8 Mon Sep 17 00:00:00 2001 From: BLoC Date: Wed, 5 Mar 2025 09:36:01 +0000 Subject: [PATCH 2/4] revert 47847438d776095e65302ef0b98c588dda2d8fa9 revert feat: text styles --- .../arm64-v8a/configure_fingerprint.bin | 24 +++++++++---------- .../armeabi-v7a/configure_fingerprint.bin | 24 +++++++++---------- .../5y6c3x6h/x86/configure_fingerprint.bin | 24 +++++++++---------- .../5y6c3x6h/x86_64/configure_fingerprint.bin | 24 +++++++++---------- lib/core/theme/text_styles.dart | 17 ------------- .../stepper_become_consultant_screen.dart | 7 ++++-- .../widgets/consultation_card_widget.dart | 7 ++++-- .../presentation/widgets/add_meal_widget.dart | 7 ++++-- .../widgets/add_product_modal.dart | 7 ++++-- ...ssary_moderation_request_modal_widget.dart | 19 +++++++++++---- .../widgets/consultant_widget.dart | 7 ++++-- .../presentation/pages/profile_screen.dart | 9 +++++-- .../widgets/ingredients_widget.dart | 13 +++++++--- .../presentation/widgets/steps_widget.dart | 7 ++++-- 14 files changed, 110 insertions(+), 86 deletions(-) diff --git a/android/app/.cxx/Debug/5y6c3x6h/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/Debug/5y6c3x6h/arm64-v8a/configure_fingerprint.bin index c7247238..51cc237b 100644 --- a/android/app/.cxx/Debug/5y6c3x6h/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/5y6c3x6h/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2` +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2` ^ -\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\android_gradle_build.json  2 2e +\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\android_gradle_build.json  2 2e c -aC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\android_gradle_build_mini.json  2 2R +aC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\android_gradle_build_mini.json  2 2R P -NC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build.ninja  2 2V +NC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build.ninja  2 2V T -RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build.ninja.txt  2[ +RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build.ninja.txt  2[ Y -WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build_file_index.txt  2 R 2\ +WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build_file_index.txt  2 R 2\ Z -XC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\compile_commands.json  2` +XC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\compile_commands.json  2` ^ -\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\compile_commands.json.bin  2 f +\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\compile_commands.json.bin  2 f d -bC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\metadata_generation_command.txt  2 +bC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\metadata_generation_command.txt  2  2Y W -UC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\prefab_config.json  2  ( 2^ +UC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\prefab_config.json  2  ( 2^ \ -ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\symbol_folder_index.txt  2  Q 2V +ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\symbol_folder_index.txt  2  Q 2V T -RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file +RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/5y6c3x6h/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/Debug/5y6c3x6h/armeabi-v7a/configure_fingerprint.bin index 8d749dc5..557aff8a 100644 --- a/android/app/.cxx/Debug/5y6c3x6h/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/5y6c3x6h/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Loge c aC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  ɓ2b +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  ɓ2b ` -^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\android_gradle_build.json  2 ɓ2g +^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\android_gradle_build.json  2 ɓ2g e -cC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\android_gradle_build_mini.json  2 ɓ2T +cC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\android_gradle_build_mini.json  2 ɓ2T R -PC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build.ninja  2 ȓ2X +PC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build.ninja  2 ȓ2X V -TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build.ninja.txt  2] +TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build.ninja.txt  2] [ -YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build_file_index.txt  2 R ɓ2^ +YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build_file_index.txt  2 R ɓ2^ \ -ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\compile_commands.json  2b +ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\compile_commands.json  2b ` -^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\compile_commands.json.bin  2 h +^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\compile_commands.json.bin  2 h f -dC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\metadata_generation_command.txt  2 +dC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\metadata_generation_command.txt  2  ɓ2[ Y -WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\prefab_config.json  2  ( ɓ2` +WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\prefab_config.json  2  ( ɓ2` ^ -\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\symbol_folder_index.txt  2  S ɓ2V +\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\symbol_folder_index.txt  2  S ɓ2V T -RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file +RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/5y6c3x6h/x86/configure_fingerprint.bin b/android/app/.cxx/Debug/5y6c3x6h/x86/configure_fingerprint.bin index e71374d0..740fa00d 100644 --- a/android/app/.cxx/Debug/5y6c3x6h/x86/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/5y6c3x6h/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log] [ YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2Z +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2Z X -VC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\android_gradle_build.json  2 2_ +VC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\android_gradle_build.json  2 2_ ] -[C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\android_gradle_build_mini.json  2 2L +[C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\android_gradle_build_mini.json  2 2L J -HC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build.ninja  2 2P +HC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build.ninja  2 2P N -LC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build.ninja.txt  2U +LC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build.ninja.txt  2U S -QC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build_file_index.txt  2 R 2V +QC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build_file_index.txt  2 R 2V T -RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\compile_commands.json  2Z +RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\compile_commands.json  2Z X -VC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\compile_commands.json.bin  2 ` +VC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\compile_commands.json.bin  2 ` ^ -\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\metadata_generation_command.txt  2 +\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\metadata_generation_command.txt  2  2S Q -OC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\prefab_config.json  2  ( 2X +OC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\prefab_config.json  2  ( 2X V -TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\symbol_folder_index.txt  2  K 2V +TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\symbol_folder_index.txt  2  K 2V T -RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file +RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/5y6c3x6h/x86_64/configure_fingerprint.bin b/android/app/.cxx/Debug/5y6c3x6h/x86_64/configure_fingerprint.bin index 47ae781e..bcc36e44 100644 --- a/android/app/.cxx/Debug/5y6c3x6h/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/5y6c3x6h/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log` ^ \C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2] +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ³2  2] [ -YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\android_gradle_build.json  2 2b +YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\android_gradle_build.json  ³2 2b ` -^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\android_gradle_build_mini.json  2 2O +^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\android_gradle_build_mini.json  ³2 2O M -KC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build.ninja  2 Ȍ2S +KC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build.ninja  ³2 Ȍ2S Q -OC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build.ninja.txt  2X +OC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build.ninja.txt  ³2X V -TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build_file_index.txt  2 R 2Y +TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build_file_index.txt  ³2 R 2Y W -UC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\compile_commands.json  2] +UC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\compile_commands.json  ³2] [ -YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\compile_commands.json.bin  2 c +YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\compile_commands.json.bin  ³2 c a -_C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\metadata_generation_command.txt  2 +_C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\metadata_generation_command.txt  ³2  2V T -RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\prefab_config.json  2  ( 2[ +RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\prefab_config.json  ³2  ( 2[ Y -WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\symbol_folder_index.txt  2  N 2V +WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\symbol_folder_index.txt  ³2  N 2V T -RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file +RC:\Users\Alex\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ³2  2 \ No newline at end of file diff --git a/lib/core/theme/text_styles.dart b/lib/core/theme/text_styles.dart index 92f1eab9..e69de29b 100644 --- a/lib/core/theme/text_styles.dart +++ b/lib/core/theme/text_styles.dart @@ -1,17 +0,0 @@ -import 'dart:ui'; - -abstract class TextStyles { - static semiBold20([Color? color]) => TextStyle( - height: 1, - fontWeight: FontWeight.w600, - fontSize: 20, - color: color ?? Color(0xFF323F4B), - ); - - static semiBold16([Color? color]) => TextStyle( - height: 1, - fontWeight: FontWeight.w600, - fontSize: 16, - color: color ?? Color(0xFF323F4B), - ); -} diff --git a/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart index 5cfb4060..e9aa8985 100644 --- a/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart +++ b/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart @@ -1,4 +1,3 @@ -import 'package:eatvio_app/core/theme/text_styles.dart'; import 'package:eatvio_app/core/utils/image_constant.dart'; import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart'; import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart'; @@ -100,7 +99,11 @@ class _StepperBecomeConsultantScreenState extends State { children: [ Text( 'Добавление блюда', - style: TextStyles.semiBold20(), + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.w600, + color: Color(0xFF323F4B), + ), ), const SizedBox(height: 16), Row( diff --git a/lib/features/diary/presentation/widgets/add_product_modal.dart b/lib/features/diary/presentation/widgets/add_product_modal.dart index 13398191..01c5a64d 100644 --- a/lib/features/diary/presentation/widgets/add_product_modal.dart +++ b/lib/features/diary/presentation/widgets/add_product_modal.dart @@ -1,5 +1,4 @@ import 'package:easy_debounce/easy_debounce.dart'; -import 'package:eatvio_app/core/theme/text_styles.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/core/widgets/custom_divider.dart'; import 'package:eatvio_app/core/widgets/custom_text_form_field.dart'; @@ -69,7 +68,11 @@ class _AddProductModalState extends State { children: [ Text( 'Добавление блюда', - style: TextStyles.semiBold20(), + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.w600, + color: Color(0xFF323F4B), + ), ), const SizedBox(height: 16), Row( diff --git a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart index 3a829830..09fd00cb 100644 --- a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart +++ b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart @@ -1,4 +1,3 @@ -import 'package:eatvio_app/core/theme/text_styles.dart'; import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/core/widgets/custom_text_form_field.dart'; @@ -56,7 +55,11 @@ class _GlossaryModerationRequestModalWidgetState extends State { const SizedBox(width: 16), Text( 'Консультант', - style: TextStyles.semiBold16(), + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w600, + color: Color( + 0xFF323F4B, + ), + ), ), const SizedBox(width: 12), if (state.profile.ratingPlace != null) diff --git a/lib/features/recipes/presentation/widgets/ingredients_widget.dart b/lib/features/recipes/presentation/widgets/ingredients_widget.dart index 78a78217..3983bccf 100644 --- a/lib/features/recipes/presentation/widgets/ingredients_widget.dart +++ b/lib/features/recipes/presentation/widgets/ingredients_widget.dart @@ -1,4 +1,3 @@ -import 'package:eatvio_app/core/theme/text_styles.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/core/widgets/custom_text_form_field.dart'; import 'package:eatvio_app/features/recipes/models/ingredient.dart'; @@ -42,7 +41,11 @@ class _IngredientsWidgetState extends State { padding: const EdgeInsets.symmetric(horizontal: 16), child: Text( 'Ингредиенты ', - style: TextStyles.semiBold20(), + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.w600, + color: Color(0xFF323F4B), + ), ), ), ReorderableListView( @@ -105,7 +108,11 @@ class _IngredientsWidgetState extends State { children: [ Text( 'Добавление ингредиента', - style: TextStyles.semiBold20(), + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.w600, + color: Color(0xFF323F4B), + ), ), const SizedBox(height: 16), SizedBox( diff --git a/lib/features/recipes/presentation/widgets/steps_widget.dart b/lib/features/recipes/presentation/widgets/steps_widget.dart index 58a9ab37..6feb9aa6 100644 --- a/lib/features/recipes/presentation/widgets/steps_widget.dart +++ b/lib/features/recipes/presentation/widgets/steps_widget.dart @@ -1,4 +1,3 @@ -import 'package:eatvio_app/core/theme/text_styles.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/core/widgets/custom_text_form_field.dart'; import 'package:eatvio_app/features/recipes/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart'; @@ -38,7 +37,11 @@ class _StepsWidgetState extends State { children: [ Text( 'Пошаговая инструкция', - style: TextStyles.semiBold20() + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.w600, + color: Color(0xFF323F4B), + ), ), const SizedBox(height: 12), ListView.separated( From c145974cc0d94dd68bc480019f908668e89a87e5 Mon Sep 17 00:00:00 2001 From: BLoC Date: Wed, 5 Mar 2025 14:11:09 +0300 Subject: [PATCH 3/4] feat: user details screen --- ios/Runner.xcodeproj/project.pbxproj | 33 +++++++------------ .../xcshareddata/xcschemes/Runner.xcscheme | 1 + .../widgets/consultation_card_widget.dart | 23 ++++++++----- pubspec.yaml | 2 +- 4 files changed, 29 insertions(+), 30 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index a87c031c..2b7e621f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -364,11 +364,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 16; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = VL68C36HYS; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 43; + DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -385,11 +383,10 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 2.0.0; + MARKETING_VERSION = 1.0.43; PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Eatvio distribution profile"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -516,11 +513,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 16; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = VL68C36HYS; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 43; + DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -537,11 +532,10 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 2.0.0; + MARKETING_VERSION = 1.0.43; PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Eatvio distribution profile"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -556,11 +550,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 16; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = VL68C36HYS; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 43; + DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -577,11 +569,10 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 2.0.0; + MARKETING_VERSION = 1.0.43; PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Eatvio distribution profile"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 5e31d3d3..c53e2b31 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -48,6 +48,7 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" + enableGPUValidationMode = "1" allowLocationSimulation = "YES"> diff --git a/lib/features/consultations/presentation/widgets/consultation_card_widget.dart b/lib/features/consultations/presentation/widgets/consultation_card_widget.dart index 74238726..84bc8e68 100644 --- a/lib/features/consultations/presentation/widgets/consultation_card_widget.dart +++ b/lib/features/consultations/presentation/widgets/consultation_card_widget.dart @@ -1,7 +1,9 @@ import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/core/widgets/custom_divider.dart'; import 'package:eatvio_app/features/consultations/entities/consultations_entity.dart'; +import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart'; import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; import 'package:table_calendar/table_calendar.dart'; class ConsultationCardWidget extends StatelessWidget { @@ -71,14 +73,19 @@ class ConsultationCardWidget extends StatelessWidget { ], ), const SizedBox(height: 12), - Text( - 'Анкета пользователя', - style: TextStyle( - color: appTheme.blueA400, - decoration: TextDecoration.underline, - decorationColor: appTheme.blueA400, - fontWeight: FontWeight.w500, - height: 1, + GestureDetector( + onTap: () { + GoRouter.of(context).pushNamed(UserDetailsScreen.name, extra: "id-754786b9-4ae6-4677-b847-1d05db44dfb9"); + }, + child: Text( + 'Анкета пользователя', + style: TextStyle( + color: appTheme.blueA400, + decoration: TextDecoration.underline, + decorationColor: appTheme.blueA400, + fontWeight: FontWeight.w500, + height: 1, + ), ), ), const SizedBox(height: 12), diff --git a/pubspec.yaml b/pubspec.yaml index 652a2efd..0a52c19c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: eatvio_app description: A new Flutter project. -version: 1.0.41+40 +version: 1.0.43+43 publish_to: 'none' environment: From 2a9dbe03f0d2e72db2a20801d3e1b30280223e4c Mon Sep 17 00:00:00 2001 From: BLoC Date: Wed, 5 Mar 2025 14:50:08 +0300 Subject: [PATCH 4/4] fix: export documents requirements, user details screen --- ios/Runner.xcodeproj/project.pbxproj | 33 +- ios/Runner/Info.plist | 2 + .../presentation/user_details_screen.dart | 584 +++++++++--------- pubspec.yaml | 2 +- 4 files changed, 308 insertions(+), 313 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index a87c031c..02e1915a 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -364,11 +364,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 16; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = VL68C36HYS; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 44; + DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -385,11 +383,10 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 2.0.0; + MARKETING_VERSION = 1.0.44; PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Eatvio distribution profile"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -516,11 +513,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 16; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = VL68C36HYS; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 44; + DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -537,11 +532,10 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 2.0.0; + MARKETING_VERSION = 1.0.44; PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Eatvio distribution profile"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -556,11 +550,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 16; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = VL68C36HYS; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 44; + DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -577,11 +569,10 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 2.0.0; + MARKETING_VERSION = 1.0.44; PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Eatvio distribution profile"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index d5b22884..cab95de7 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -2,6 +2,8 @@ + ITSAppUsesNonExemptEncryption + CADisableMinimumFrameDurationOnPhone CFBundleDevelopmentRegion diff --git a/lib/features/user_details/presentation/user_details_screen.dart b/lib/features/user_details/presentation/user_details_screen.dart index 345bc895..49f90f1f 100644 --- a/lib/features/user_details/presentation/user_details_screen.dart +++ b/lib/features/user_details/presentation/user_details_screen.dart @@ -104,298 +104,300 @@ class _UserDetailsContentState extends State { ), ], ), - body: SingleChildScrollView( - controller: ScrollController() - ..addListener(() { - setState(() { - isMoreOptionsVisible = false; - }); - }), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - spacing: 12, - children: [ - SizedBox.shrink(), - _charts(), - ExpandableBouble( - initiallyExpanded: true, - title: s.general_info, - children: [ - Text( - s.date_of_birth, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: DateTime.parse(profileDetails.birthdate).format('dd.MM.yyyy')), - ), - SizedBox(height: 16), - Text( - s.sex, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.gender.parseGender()), - ), - SizedBox(height: 16), - ], - ), - ExpandableBouble( - title: s.physical_fitness, - children: [ - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - s.height, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.height.toString()), - ), - ], - ), - ), - SizedBox(width: 8), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - s.weight, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.weight.toStringAsFixed(0)), - ), - ], - ), - ), - ], - ), - SizedBox(height: 16), - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - s.chest_circumference, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.chestCircumference.toString()), - ), - ], - ), - ), - SizedBox(width: 8), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - s.waist_circumference, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.waistCircumference.toString()), - ), - ], - ), - ), - SizedBox(width: 8), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - s.hip_circumference, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.hipCircumference.toString()), - ), - ], - ), - ), - ], - ), - SizedBox(height: 16), - ], - ), - ExpandableBouble( - title: s.pressure, - children: [ - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - s.upper, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.bloodPressureUp.toString()), - ), - ], - ), - ), - SizedBox(width: 8), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - s.lower, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.bloodPressureDown.toStringAsFixed(0)), - ), - ], - ), - ), - ], - ), - SizedBox(height: 16), - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - s.has_hypo, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.hasHypo.toString()), - ), - ], - ), - ), - SizedBox(width: 8), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - s.has_hyper, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.hasHyper.toString()), - ), - ], - ), - ), - ], - ), - SizedBox(height: 16), - ], - ), - ExpandableBouble( - title: s.other_info, - children: [ - Text( - s.has_alergy, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.aboutAlergy), - ), - SizedBox(height: 16), - Text( - s.takes_pills, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.aboutTakingPils), - ), - SizedBox(height: 16), - Text( - s.sport_hobbies, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.aboutSportHobbies), - ), - SizedBox(height: 16), - Text( - s.liked_groceries, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.favoriteFoods), - ), - SizedBox(height: 16), - Text( - s.not_liked_groceries, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - CustomTextFormField( - readOnly: true, - controller: TextEditingController(text: profileDetails.unfavoriteFoods), - ), - SizedBox(height: 16), - Text( - s.additional_information, - style: TextStyles.textSMedium.copyWith(color: appTheme.black), - ), - SizedBox(height: 4), - SizedBox( - height: 112, - child: CustomTextFormField( - readOnly: true, - maxLength: 1000, - maxLines: null, - minLines: null, - expands: true, - textAlignVertical: TextAlignVertical.top, - controller: TextEditingController(text: profileDetails.additionalInfo), + body: SafeArea( + child: SingleChildScrollView( + controller: ScrollController() + ..addListener(() { + setState(() { + isMoreOptionsVisible = false; + }); + }), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + spacing: 12, + children: [ + SizedBox.shrink(), + _charts(), + ExpandableBouble( + initiallyExpanded: true, + title: s.general_info, + children: [ + Text( + s.date_of_birth, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), ), - ), - SizedBox(height: 16), - ], - ), - ], + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: DateTime.parse(profileDetails.birthdate).format('dd.MM.yyyy')), + ), + SizedBox(height: 16), + Text( + s.sex, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.gender.parseGender()), + ), + SizedBox(height: 16), + ], + ), + ExpandableBouble( + title: s.physical_fitness, + children: [ + Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + s.height, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.height.toString()), + ), + ], + ), + ), + SizedBox(width: 8), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + s.weight, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.weight.toStringAsFixed(0)), + ), + ], + ), + ), + ], + ), + SizedBox(height: 16), + Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + s.chest_circumference, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.chestCircumference.toString()), + ), + ], + ), + ), + SizedBox(width: 8), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + s.waist_circumference, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.waistCircumference.toString()), + ), + ], + ), + ), + SizedBox(width: 8), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + s.hip_circumference, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.hipCircumference.toString()), + ), + ], + ), + ), + ], + ), + SizedBox(height: 16), + ], + ), + ExpandableBouble( + title: s.pressure, + children: [ + Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + s.upper, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.bloodPressureUp.toString()), + ), + ], + ), + ), + SizedBox(width: 8), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + s.lower, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.bloodPressureDown.toStringAsFixed(0)), + ), + ], + ), + ), + ], + ), + SizedBox(height: 16), + Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + s.has_hypo, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.hasHypo.toString()), + ), + ], + ), + ), + SizedBox(width: 8), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + s.has_hyper, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.hasHyper.toString()), + ), + ], + ), + ), + ], + ), + SizedBox(height: 16), + ], + ), + ExpandableBouble( + title: s.other_info, + children: [ + Text( + s.has_alergy, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.aboutAlergy), + ), + SizedBox(height: 16), + Text( + s.takes_pills, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.aboutTakingPils), + ), + SizedBox(height: 16), + Text( + s.sport_hobbies, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.aboutSportHobbies), + ), + SizedBox(height: 16), + Text( + s.liked_groceries, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.favoriteFoods), + ), + SizedBox(height: 16), + Text( + s.not_liked_groceries, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + CustomTextFormField( + readOnly: true, + controller: TextEditingController(text: profileDetails.unfavoriteFoods), + ), + SizedBox(height: 16), + Text( + s.additional_information, + style: TextStyles.textSMedium.copyWith(color: appTheme.black), + ), + SizedBox(height: 4), + SizedBox( + height: 112, + child: CustomTextFormField( + readOnly: true, + maxLength: 1000, + maxLines: null, + minLines: null, + expands: true, + textAlignVertical: TextAlignVertical.top, + controller: TextEditingController(text: profileDetails.additionalInfo), + ), + ), + SizedBox(height: 16), + ], + ), + ], + ), ), ), ); diff --git a/pubspec.yaml b/pubspec.yaml index 0a52c19c..1f33f933 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: eatvio_app description: A new Flutter project. -version: 1.0.43+43 +version: 1.0.44+44 publish_to: 'none' environment: