apoloz/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

revert 47847438d7

Browse Source 
revert feat: text styles
This commit is contained in:
BLoC
2025-03-05 09:36:01 +00:00
parent 47847438d7
commit c6be45c5a4
14 changed files with 110 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
android/app/.cxx/Debug/5y6c3x6h/arm64-v8a/configure_fingerprint.bin
View File

@@ -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

24
android/app/.cxx/Debug/5y6c3x6h/armeabi-v7a/configure_fingerprint.bin
View File

@@ -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

24
android/app/.cxx/Debug/5y6c3x6h/x86/configure_fingerprint.bin
View File

@@ -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

24
android/app/.cxx/Debug/5y6c3x6h/x86_64/configure_fingerprint.bin
View File

@@ -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

17
lib/core/theme/text_styles.dart
View File

@@ -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),
);
}

7
lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart
View File

@@ -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<StepperBecomeConsultantS
Text(
'Спасибо!\nВаши данные отправлены на модерацию',
textAlign: TextAlign.center,
style: TextStyles.semiBold20(),
style: TextStyle(
fontSize: 20,
height: 1,
fontWeight: FontWeight.w600,
),
),
const SizedBox(height: 16),
Lottie.asset(

7
lib/features/consultations/presentation/widgets/consultation_card_widget.dart
View File

@@ -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_divider.dart';
import 'package:eatvio_app/features/consultations/entities/consultations_entity.dart';
@@ -181,7 +180,11 @@ class ConsultationCardWidget extends StatelessWidget {
const SizedBox(height: 12),
Text(
'${consultationsEntity.paymentAmount} ₽',
style: TextStyles.semiBold20(),
style: TextStyle(
color: Color(0xFF019A3E),
fontSize: 20,
fontWeight: FontWeight.w600,
),
),
const SizedBox(height: 16),
Row(

7
lib/features/create_diet/presentation/widgets/add_meal_widget.dart
View File

@@ -1,5 +1,4 @@
import 'package:eatvio_app/core/locator_service.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_text_form_field.dart';
import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_cubit.dart';
@@ -55,7 +54,11 @@ class _AddMealWidgetState extends State<AddMealWidget> {
children: [
Text(
'Добавление блюда',
style: TextStyles.semiBold20(),
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w600,
color: Color(0xFF323F4B),
),
),
const SizedBox(height: 16),
Row(

7
lib/features/diary/presentation/widgets/add_product_modal.dart
View File

@@ -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<AddProductModal> {
children: [
Text(
'Добавление блюда',
style: TextStyles.semiBold20(),
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w600,
color: Color(0xFF323F4B),
),
),
const SizedBox(height: 16),
Row(

19
lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
View File

@@ -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<GlossaryModeratio
Text(
'Добавление нового продукта',
textAlign: TextAlign.center,
style: TextStyles.semiBold20(),
style: TextStyle(
color: Color(0xFF323F4B),
fontSize: 20,
fontWeight: FontWeight.w600,
),
),
const SizedBox(height: 16),
Text(
@@ -143,7 +146,11 @@ class _GlossaryModerationRequestModalWidgetState extends State<GlossaryModeratio
Text(
'Продукт успешно отправлен\nна модерацию',
textAlign: TextAlign.center,
style: TextStyles.semiBold20(),
style: TextStyle(
color: Color(0xFF323F4B),
fontSize: 20,
fontWeight: FontWeight.w600,
),
),
const SizedBox(height: 16),
Lottie.asset(
@@ -191,7 +198,11 @@ class _GlossaryModerationRequestModalWidgetState extends State<GlossaryModeratio
Text(
'Добавление нового продукта',
textAlign: TextAlign.center,
style: TextStyles.semiBold20(),
style: TextStyle(
color: Color(0xFF323F4B),
fontSize: 20,
fontWeight: FontWeight.w600,
),
),
const SizedBox(height: 16),
Text(

7
lib/features/feed/presentation/widgets/consultant_widget.dart
View File

@@ -1,6 +1,5 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:eatvio_app/core/const.dart';
import 'package:eatvio_app/core/theme/text_styles.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/feed_consultant_model.dart';
@@ -55,7 +54,11 @@ class ConsultantWidget extends StatelessWidget {
),
child: Text(
'${consultant.ratingPlace}',
style: TextStyles.semiBold20(),
style: TextStyle(
fontSize: 20,
color: appTheme.blueA400,
fontWeight: FontWeight.w600,
),
),
),
const SizedBox(width: 8),

9
lib/features/profile/presentation/pages/profile_screen.dart
View File

@@ -3,7 +3,6 @@ import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:dismissible_page/dismissible_page.dart';
import 'package:eatvio_app/core/const.dart';
import 'package:eatvio_app/core/theme/text_styles.dart';
import 'package:eatvio_app/core/utils/date_time_utils.dart';
import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
@@ -137,7 +136,13 @@ class _ProfileScreenState extends State<ProfileScreen> {
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)

13
lib/features/recipes/presentation/widgets/ingredients_widget.dart
View File

@@ -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<IngredientsWidget> {
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<IngredientsWidget> {
children: [
Text(
'Добавление ингредиента',
style: TextStyles.semiBold20(),
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w600,
color: Color(0xFF323F4B),
),
),
const SizedBox(height: 16),
SizedBox(

7
lib/features/recipes/presentation/widgets/steps_widget.dart
View File

@@ -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<StepsWidget> {
children: [
Text(
'Пошаговая инструкция',
style: TextStyles.semiBold20()
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w600,
color: Color(0xFF323F4B),
),
),
const SizedBox(height: 12),
ListView.separated(