feat: card

2025-02-28 16:48:49 +03:00
parent 9251bcbff1
commit cebbb4fb2d
7 changed files with 167 additions and 61 deletions
--- 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 <20>õ‘×Ñ2`
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<EFBFBD>³üâÔ2 <20>õ‘×Ñ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	<EFBFBD>³üâÔ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	<EFBFBD>³üâÔ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	<EFBFBD>³üâÔ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	<EFBFBD>³üâÔ2[
 Y
-WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build_file_index.txt	üåÕ½Ò2
+WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build_file_index.txt	<EFBFBD>³üâÔ2
 R ¬õ‘×Ñ2\
-Z
+Z
 XC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\compile_commands.json	<08>³üâÔ2`
-^
+^
 \C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\compile_commands.json.bin	<08>³üâÔ2	f
-d
+d
 bC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\metadata_generation_command.txt	<08>³üâÔ2
 « ¨õ‘×Ñ2Y
-W
+W
 UC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\prefab_config.json	<08>³üâÔ2
-( ©õ‘×Ñ2^
+( ©õ‘×Ñ2^
 \
-ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\symbol_folder_index.txt	üåÕ½Ò2
+ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\symbol_folder_index.txt	<EFBFBD>³üâÔ2
--- 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
+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
-`
+`
 ^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\compile_commands.json.bin	 ³üâÔ2	h
-f
+f
 dC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\metadata_generation_command.txt	 ³üâÔ2
 µ ÇÉ“×Ñ2[
-Y
+Y
 WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\prefab_config.json	 ³üâÔ2
-( ÈÉ“×Ñ2`
+( ÈÉ“×Ñ2`
 ^
-\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\symbol_folder_index.txt	¶æÕ½Ò2
+\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\symbol_folder_index.txt	 ³üâÔ2
--- 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
+QC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build_file_index.txt	²³üâÔ2
 R §‚”×Ñ2V
-T
+T
 RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\compile_commands.json	²³üâÔ2Z
-X
+X
 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
 <18>  ‚”×Ñ2S
-Q
+Q
 OC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\prefab_config.json	²³üâÔ2
-( £‚”×Ñ2X
+( £‚”×Ñ2X
 V
-TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\symbol_folder_index.txt	ìæÕ½Ò2
+TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\symbol_folder_index.txt	²³üâÔ2
--- 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
+TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build_file_index.txt	Â³üâÔ2
 R ¹<>”×Ñ2Y
-W
+W
 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
-a
+a
 _C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\metadata_generation_command.txt	Â³üâÔ2
 œ ®<>”×Ñ2V
-T
+T
 RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\prefab_config.json	Â³üâÔ2
-( °<>”×Ñ2[
+( °<>”×Ñ2[
 Y
-WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\symbol_folder_index.txt	ŸçÕ½Ò2
+WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\symbol_folder_index.txt	Â³üâÔ2
--- a/assets/icons/mir.svg
+++ b/assets/icons/mir.svg
@@ -0,0 +1,17 @@
+<svg width="62" height="17" viewBox="0 0 62 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3015_18047)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.707 3.2344e-07V0.0074239C16.6994 0.0074239 14.2853 2.83187e-07 13.6415 2.2345C13.0514 4.28341 11.3884 9.94017 11.3424 10.0961H10.8826C10.8826 10.0961 9.18121 4.3131 8.58344 2.22707C7.93968 -0.00742333 5.51792 3.2344e-07 5.51792 3.2344e-07H0V17H5.51792V6.90393H5.74784H5.97775L9.19654 17H13.0284L16.2472 6.91135H16.707V17H22.225V3.2344e-07H16.707Z" fill="#4DB45E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.8626 0C36.8626 0 35.2456 0.141048 34.4869 1.78166L30.5783 10.0961H30.1185V0H24.6006V17H29.812C29.812 17 31.5057 16.8515 32.2644 15.2183L36.0963 6.90393H36.5561V17H42.074V0H36.8626Z" fill="#4DB45E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M44.5264 7.72052V17H50.0443V11.5808H56.022C58.6277 11.5808 60.8349 9.96987 61.6549 7.72052H44.5264Z" fill="#4DB45E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M56.0226 0H43.7529C44.366 3.23668 46.8721 5.83493 50.1139 6.68122C50.8496 6.87424 51.6236 6.97817 52.4207 6.97817H61.8778C61.9621 6.59214 62.0004 6.19869 62.0004 5.79039C62.0004 2.59083 59.3257 0 56.0226 0Z" fill="url(#paint0_linear_3015_18047)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_3015_18047" x1="43.7544" y1="3.48908" x2="62.0004" y2="3.48908" gradientUnits="userSpaceOnUse">
+<stop offset="0.3" stop-color="#00B4E6"/>
+<stop offset="1" stop-color="#088CCB"/>
+</linearGradient>
+<clipPath id="clip0_3015_18047">
+<rect width="62" height="17" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- 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',
--- 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,
+              ),
+            ),
+          ],
+        ),
      ),
    );
  }