From cebbb4fb2d842d92815a48a5ad942b712146c7cd Mon Sep 17 00:00:00 2001 From: BLoC Date: Fri, 28 Feb 2025 16:48:49 +0300 Subject: [PATCH] feat: card --- .../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 ++--- assets/icons/mir.svg | 17 ++++ .../menu/presentation/pages/menu_screen.dart | 23 +++-- .../presentation/pages/card_settings.dart | 92 ++++++++++++++++++- 7 files changed, 167 insertions(+), 61 deletions(-) create mode 100644 assets/icons/mir.svg 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 95f79a78..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 53204e1b..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 87742c49..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 2b1ee525..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/assets/icons/mir.svg b/assets/icons/mir.svg new file mode 100644 index 00000000..6fcc4027 --- /dev/null +++ b/assets/icons/mir.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/lib/features/menu/presentation/pages/menu_screen.dart b/lib/features/menu/presentation/pages/menu_screen.dart index 5b6b2e8c..45728f70 100644 --- a/lib/features/menu/presentation/pages/menu_screen.dart +++ b/lib/features/menu/presentation/pages/menu_screen.dart @@ -57,18 +57,17 @@ class MenuScreen extends StatelessWidget { onTap: () => GoRouter.of(context).push(MyPlansScreen.path), ), _divider(context), - if (!profileModel.roles.contains('consultant')) - _tile( - leading: 'assets/icons/finance.svg', - title: 'Мои финансы', - onTap: () => GoRouter.of(context).pushNamed('consultantFinanceScreen'), - ) - else - _tile( - leading: 'assets/icons/finance.svg', - title: 'Мои финансы', - onTap: () => GoRouter.of(context).pushNamed('userFinanceScreen'), - ), + _tile( + leading: 'assets/icons/finance.svg', + title: 'Мои финансы', + onTap: () { + if (profileModel.roles.contains('consultant')) { + GoRouter.of(context).pushNamed('consultantFinanceScreen'); + } else { + GoRouter.of(context).pushNamed('userFinanceScreen'); + } + }, + ), _divider(context), _tile( leading: 'assets/icons/calendar.svg', diff --git a/lib/features/my_finance/presentation/pages/card_settings.dart b/lib/features/my_finance/presentation/pages/card_settings.dart index 9b453065..abba517d 100644 --- a/lib/features/my_finance/presentation/pages/card_settings.dart +++ b/lib/features/my_finance/presentation/pages/card_settings.dart @@ -1,4 +1,6 @@ +import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; class CardSettingsScreen extends StatelessWidget { const CardSettingsScreen({super.key}); @@ -17,7 +19,95 @@ class CardSettingsScreen extends StatelessWidget { centerTitle: true, ), body: Column( - children: [], + children: [ + const SizedBox(height: 16), + Material( + borderRadius: BorderRadius.circular(12), + color: Colors.white, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 16), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Text( + 'Привязанные карты', + style: TextStyle( + color: Color(0xFF323F4B), + fontSize: 18, + fontWeight: FontWeight.w600, + height: 1, + ), + ), + ), + const SizedBox(height: 8), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Text( + 'Выплату будут производиться\nна карту ** 0278', + style: TextStyle( + color: Color(0xFF323F4B), + fontSize: 16, + fontWeight: FontWeight.w500, + height: 1, + ), + ), + ), + const SizedBox(height: 16), + SingleChildScrollView( + padding: EdgeInsets.symmetric(horizontal: 16), + scrollDirection: Axis.horizontal, + child: Row( + children: [ + _card(true), + const SizedBox(width: 8), + _card(), + const SizedBox(width: 8), + _card(), + ], + ), + ), + const SizedBox(height: 16), + ], + ), + ), + ], + ), + ); + } + + _card([bool isSelected = false]) { + return Container( + padding: EdgeInsets.all(4), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8), + border: Border.all( + color: isSelected ? appTheme.blueA400 : Color(0xFFF1F2F6), + width: 2, + ), + ), + child: Container( + width: 148, + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Color(0xFFF1F2F6), + borderRadius: BorderRadius.circular(4), + ), + child: Column( + children: [ + SvgPicture.asset('assets/icons/mir.svg'), + const SizedBox(height: 24), + Text( + '** 0278', + style: TextStyle( + color: Color(0xFF323F4B), + fontSize: 14, + height: 1, + fontWeight: FontWeight.w600, + ), + ), + ], + ), ), ); }