Merge pull request 'env' (#590) from mso7nueh/eatvio_app:main into main

Reviewed-on: eatvio/eatvio_app#590
This commit is contained in:
mso7nueh
2025-08-04 10:18:00 +00:00
18 changed files with 348 additions and 509 deletions

View File

@@ -119,7 +119,7 @@ jobs:
run: flutter test run: flutter test
- name: Build apk - name: Build apk
run: flutter build apk --release run: flutter build apk --release --dart-define=HIDE_PLANS=false
- name: Rename and move apk - name: Rename and move apk
run: | run: |

2
.gitignore vendored
View File

@@ -16,3 +16,5 @@
*.mocks.dart *.mocks.dart
android/build/ android/build/
ios/XCBuildData/ ios/XCBuildData/
.env
env.example

84
ENV_SETUP.md Normal file
View File

@@ -0,0 +1,84 @@
# Настройка переменных окружения
Этот проект использует переменные окружения для хранения секретных данных и конфигурации.
## Установка
1. Скопируйте файл `env.example` в `.env`:
```bash
cp env.example .env
```
2. Отредактируйте файл `.env` и замените значения на ваши собственные секреты.
## Переменные окружения
### API URLs
- `BASE_URL` - основной URL API (по умолчанию: https://eatvio.ru)
- `DEV_BASE_URL` - URL API для разработки (по умолчанию: https://dev2.eatvio.com)
### Sentry Configuration
- `SENTRY_DSN` - DSN для Sentry мониторинга
### Firebase Configuration
- `FIREBASE_PROJECT_ID` - ID проекта Firebase
- `FIREBASE_DATABASE_URL` - URL базы данных Firebase
- `FIREBASE_STORAGE_BUCKET` - bucket для хранения файлов
- `FIREBASE_MESSAGING_SENDER_ID` - ID отправителя сообщений
### Firebase Android Configuration
- `FIREBASE_ANDROID_API_KEY` - API ключ для Android
- `FIREBASE_ANDROID_APP_ID` - ID приложения для Android
### Firebase iOS Configuration
- `FIREBASE_IOS_API_KEY` - API ключ для iOS
- `FIREBASE_IOS_APP_ID` - ID приложения для iOS
- `FIREBASE_IOS_BUNDLE_ID` - Bundle ID для iOS
### App Store URLs
- `APP_STORE_URL` - URL App Store
- `RUSTORE_URL` - URL RuStore
### Support URLs
- `TELEGRAM_SUPPORT_URL` - URL поддержки в Telegram
- `SUPPORT_EMAIL` - email для поддержки
### Test Credentials (только для разработки)
- `TEST_EMAIL` - тестовый email
- `TEST_PASSWORD` - тестовый пароль
### Email Validation API
- `EMAIL_VALIDATION_API_URL` - URL API для валидации email
### Connection Check URLs
- `GOOGLE_CHECK_URL` - URL для проверки соединения (Google)
- `YANDEX_CHECK_URL` - URL для проверки соединения (Yandex)
## Безопасность
⚠️ **ВАЖНО**: Файл `.env` добавлен в `.gitignore` и не должен попадать в репозиторий. Все секретные данные должны храниться только в этом файле.
## Использование в коде
Для доступа к переменным окружения используйте класс `EnvConfig`:
```dart
import 'package:eatvio_app/core/env_config.dart';
String baseUrl = EnvConfig.baseUrl;
String sentryDsn = EnvConfig.sentryDsn;
```
## Миграция
Все секреты были перенесены из кода в переменные окружения:
1. **Sentry DSN** - из `main.dart`
2. **Firebase конфигурация** - из `firebase_options.dart`
3. **API URLs** - из `const.dart`
4. **URL для проверки соединения** - из `internet_connection_checker_screen.dart`
5. **URL для обновления приложения** - из `update_screen.dart`
6. **URL поддержки Telegram** - из `support_screen.dart`
7. **API для валидации email** - из `registration_repository.dart`
8. **Тестовые учетные данные** - из `test_cases.dart`
9. **Email поддержки** - из `support_screen.dart`

View File

@@ -20,7 +20,13 @@ platform :ios do
lane :beta do lane :beta do
match(type: "appstore", readonly: true) match(type: "appstore", readonly: true)
increment_build_number(xcodeproj: "Runner.xcodeproj") increment_build_number(xcodeproj: "Runner.xcodeproj")
build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store", codesigning_identity: "Apple Distribution") build_app(
workspace: "Runner.xcworkspace",
scheme: "Runner",
export_method: "app-store",
codesigning_identity: "Apple Distribution",
build_args: "--dart-define=HIDE_PLANS=true"
)
app_store_connect_api_key(key_id: "325JS9JCZH", issuer_id: "dfa27d1d-2bb8-4d4d-847e-0b32f9b880b3", key_filepath: "./AuthKey.p8") app_store_connect_api_key(key_id: "325JS9JCZH", issuer_id: "dfa27d1d-2bb8-4d4d-847e-0b32f9b880b3", key_filepath: "./AuthKey.p8")
upload_to_testflight upload_to_testflight
end end

View File

@@ -1,5 +1,7 @@
String baseUrl = 'https://eatvio.ru'; import 'package:eatvio_app/core/env_config.dart';
bool hidePlans = true;
String baseUrl = EnvConfig.baseUrl;
bool hidePlans = const bool.fromEnvironment('HIDE_PLANS', defaultValue: false);
const List<int> durationValues = [7, 14, 21]; const List<int> durationValues = [7, 14, 21];

43
lib/core/env_config.dart Normal file
View File

@@ -0,0 +1,43 @@
import 'package:flutter_dotenv/flutter_dotenv.dart';
class EnvConfig {
static String get baseUrl => dotenv.env['BASE_URL'] ?? 'https://eatvio.ru';
static String get devBaseUrl => dotenv.env['DEV_BASE_URL'] ?? 'https://dev2.eatvio.com';
// Sentry Configuration
static String get sentryDsn => dotenv.env['SENTRY_DSN'] ?? 'http://ba7f2653067776f3034e6e89850e85a1@sentry.md-desk.ru:9000/2';
// Firebase Configuration
static String get firebaseProjectId => dotenv.env['FIREBASE_PROJECT_ID'] ?? 'eatvio-3467b';
static String get firebaseDatabaseUrl => dotenv.env['FIREBASE_DATABASE_URL'] ?? 'https://eatvio-3467b-default-rtdb.europe-west1.firebasedatabase.app';
static String get firebaseStorageBucket => dotenv.env['FIREBASE_STORAGE_BUCKET'] ?? 'eatvio-3467b.firebasestorage.app';
static String get firebaseMessagingSenderId => dotenv.env['FIREBASE_MESSAGING_SENDER_ID'] ?? '613980912922';
// Firebase Android Configuration
static String get firebaseAndroidApiKey => dotenv.env['FIREBASE_ANDROID_API_KEY'] ?? 'AIzaSyBUe1UqAAMfgMcd4hWdRoLF1Os-yn-HE9k';
static String get firebaseAndroidAppId => dotenv.env['FIREBASE_ANDROID_APP_ID'] ?? '1:613980912922:android:4de95e5f2d50ba69ecc0a3';
// Firebase iOS Configuration
static String get firebaseIosApiKey => dotenv.env['FIREBASE_IOS_API_KEY'] ?? 'AIzaSyBnE8tQjL9_1HuXrTnqNy6qbXpoenO36yQ';
static String get firebaseIosAppId => dotenv.env['FIREBASE_IOS_APP_ID'] ?? '1:613980912922:ios:c557d140a1212e63ecc0a3';
static String get firebaseIosBundleId => dotenv.env['FIREBASE_IOS_BUNDLE_ID'] ?? 'com.eatvioapp.app';
// App Store URLs
static String get appStoreUrl => dotenv.env['APP_STORE_URL'] ?? 'https://apps.apple.com/app/idYOUR_APP_ID';
static String get rustoreUrl => dotenv.env['RUSTORE_URL'] ?? 'https://www.rustore.ru/catalog/app/com.eatvioapp.app';
// Telegram Support
static String get telegramSupportUrl => dotenv.env['TELEGRAM_SUPPORT_URL'] ?? 'https://t.me/eatvio';
static String get supportEmail => dotenv.env['SUPPORT_EMAIL'] ?? 'help@eatv.io';
// Test Credentials (for development only)
static String get testEmail => dotenv.env['TEST_EMAIL'] ?? 'reshetnick.mike+user1@gmail.com';
static String get testPassword => dotenv.env['TEST_PASSWORD'] ?? '1234567890';
// Email Validation API
static String get emailValidationApiUrl => dotenv.env['EMAIL_VALIDATION_API_URL'] ?? 'https://api.validate.email/validate';
// Connection Check URLs
static String get googleCheckUrl => dotenv.env['GOOGLE_CHECK_URL'] ?? 'https://google.com';
static String get yandexCheckUrl => dotenv.env['YANDEX_CHECK_URL'] ?? 'https://yandex.ru';
}

View File

@@ -14,10 +14,7 @@ import 'package:go_router/go_router.dart';
class ConsultationCardWidget extends StatefulWidget { class ConsultationCardWidget extends StatefulWidget {
final ConsultationModel consultationsModel; final ConsultationModel consultationsModel;
const ConsultationCardWidget({ const ConsultationCardWidget({super.key, required this.consultationsModel});
super.key,
required this.consultationsModel,
});
@override @override
State<ConsultationCardWidget> createState() => _ConsultationCardWidgetState(); State<ConsultationCardWidget> createState() => _ConsultationCardWidgetState();
@@ -32,13 +29,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
'Дневник заполнен, прокомментирован консультантом и после этого клиент просмотрел комментарии.', 'Дневник заполнен, прокомментирован консультантом и после этого клиент просмотрел комментарии.',
]; ];
final List<Color> legendColors = const [ final List<Color> legendColors = const [Colors.white, Color(0xFFF0C497), Color(0xFFFF9500), Color(0xFF2F80ED), Color(0xFF4CD964)];
Colors.white,
Color(0xFFF0C497),
Color(0xFFFF9500),
Color(0xFF2F80ED),
Color(0xFF4CD964),
];
late final List<(int, DiaryModel)> givenDaysWithDayNumber; late final List<(int, DiaryModel)> givenDaysWithDayNumber;
final List<List<DiaryStateEnum>> legendStates = [ final List<List<DiaryStateEnum>> legendStates = [
@@ -46,7 +37,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
[DiaryStateEnum.started, DiaryStateEnum.lastDayStarted], [DiaryStateEnum.started, DiaryStateEnum.lastDayStarted],
[DiaryStateEnum.finished, DiaryStateEnum.lastDayFinished], [DiaryStateEnum.finished, DiaryStateEnum.lastDayFinished],
[DiaryStateEnum.commented, DiaryStateEnum.lastDayCommented], [DiaryStateEnum.commented, DiaryStateEnum.lastDayCommented],
[DiaryStateEnum.reviewedByUser] [DiaryStateEnum.reviewedByUser],
]; ];
@override @override
void initState() { void initState() {
@@ -72,32 +63,19 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
children: [ children: [
Row( Row(
children: [ children: [
CircleAvatar( CircleAvatar(radius: 30, backgroundImage: NetworkImage(baseUrl + widget.consultationsModel.userProfilePhotoUrl)),
radius: 30,
backgroundImage: NetworkImage(baseUrl + widget.consultationsModel.userProfilePhotoUrl),
),
const SizedBox(width: 12), const SizedBox(width: 12),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
widget.consultationsModel.userName, widget.consultationsModel.userName,
style: const TextStyle( style: const TextStyle(height: 1, color: Color(0xFF323F4B), fontSize: 16, fontWeight: FontWeight.w600),
height: 1,
color: Color(0xFF323F4B),
fontSize: 16,
fontWeight: FontWeight.w600,
),
), ),
const SizedBox(height: 4), const SizedBox(height: 4),
Text( Text(
widget.consultationsModel.planTitle, widget.consultationsModel.planTitle,
style: const TextStyle( style: const TextStyle(height: 1, color: Color(0xFF88949F), fontSize: 14, fontWeight: FontWeight.w500),
height: 1,
color: Color(0xFF88949F),
fontSize: 14,
fontWeight: FontWeight.w500,
),
), ),
], ],
), ),
@@ -127,12 +105,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
children: [ children: [
Text( Text(
'День ${widget.consultationsModel.currentDiaryDay} из ${widget.consultationsModel.duration}', 'День ${widget.consultationsModel.currentDiaryDay} из ${widget.consultationsModel.duration}',
style: const TextStyle( style: const TextStyle(height: 1, color: Color(0xFF323F4B), fontSize: 16, fontWeight: FontWeight.w500),
height: 1,
color: Color(0xFF323F4B),
fontSize: 16,
fontWeight: FontWeight.w500,
),
), ),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
@@ -149,12 +122,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
children: [ children: [
const Text( const Text(
'Легенда', 'Легенда',
style: TextStyle( style: TextStyle(height: 1, fontSize: 20, fontWeight: FontWeight.w700, color: Color(0xFF323F4B)),
height: 1,
fontSize: 20,
fontWeight: FontWeight.w700,
color: Color(0xFF323F4B),
),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
ListView.separated( ListView.separated(
@@ -170,11 +138,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
), ),
); );
}, },
child: const Icon( child: const Icon(Icons.help_outline_rounded, color: Color(0xFF323F4B), size: 20),
Icons.help_outline_rounded,
color: Color(0xFF323F4B),
size: 20,
),
), ),
], ],
), ),
@@ -185,7 +149,8 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
children: List.generate(widget.consultationsModel.duration, (index) { children: List.generate(widget.consultationsModel.duration, (index) {
final day = givenDaysWithDayNumber.firstWhereOrNull((e) => e.$1 == index); final day = givenDaysWithDayNumber.firstWhereOrNull((e) => e.$1 == index);
final hasActivity = day != null && day.$2.state != DiaryStateEnum.init; final hasActivity = day != null && day.$2.state != DiaryStateEnum.init;
final canConsultantOpenThisDay = day != null && final canConsultantOpenThisDay =
day != null &&
(day.$2.state != DiaryStateEnum.init && day.$2.state != DiaryStateEnum.started && day.$2.state != DiaryStateEnum.lastDayStarted); (day.$2.state != DiaryStateEnum.init && day.$2.state != DiaryStateEnum.started && day.$2.state != DiaryStateEnum.lastDayStarted);
return Padding( return Padding(
padding: const EdgeInsets.only(right: 12), padding: const EdgeInsets.only(right: 12),
@@ -195,81 +160,74 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
InkWell( InkWell(
onTap: () { onTap: () {
if (!hasActivity || !canConsultantOpenThisDay) { if (!hasActivity || !canConsultantOpenThisDay) {
showErrorDialog(context, showErrorDialog(
title: s.you_can_not_open_this_day, description: '${widget.consultationsModel.userName} ${s.has_not_filled_it_yet}'); context,
title: s.you_can_not_open_this_day,
description: '${widget.consultationsModel.userName} ${s.has_not_filled_it_yet}',
);
return; return;
} }
GoRouter.of(context).push(UserDiaryScreen.path, extra: { GoRouter.of(context).push(UserDiaryScreen.path, extra: {'diaryId': day.$2.id, 'currentDiaryDay': index + 1});
'diaryId': day.$2.id,
'currentDiaryDay': index + 1,
});
}, },
borderRadius: BorderRadius.circular(100), borderRadius: BorderRadius.circular(100),
child: Ink( child: Ink(
decoration: BoxDecoration( decoration: BoxDecoration(
color: hasActivity ? appTheme.dividerColor : appTheme.dividerColor.withValues(alpha: 0.4), color: hasActivity ? appTheme.dividerColor : appTheme.dividerColor.withValues(alpha: 0.4),
borderRadius: BorderRadius.circular(100)), borderRadius: BorderRadius.circular(100),
),
width: 58, width: 58,
height: 32, height: 32,
child: Center( child: Center(
child: Text( child: Text(
(index + 1).toString(), (index + 1).toString(),
style: TextStyles.textMSemibold.copyWith( style: TextStyles.textMSemibold.copyWith(color: hasActivity ? appTheme.gray : appTheme.gray.withValues(alpha: 0.4)),
color: hasActivity ? appTheme.gray : appTheme.gray.withValues(alpha: 0.4),
),
), ),
), ),
), ),
), ),
if (hasActivity) ...[ if (hasActivity) ...[
const SizedBox( const SizedBox(height: 4),
height: 4,
),
switch (day.$2.state) { switch (day.$2.state) {
DiaryStateEnum.init => const SizedBox.shrink(), DiaryStateEnum.init => const SizedBox.shrink(),
DiaryStateEnum.started => Container( DiaryStateEnum.started => Container(
width: 8, width: 8,
height: 8, height: 8,
decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[1]), decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[1]),
), ),
DiaryStateEnum.lastDayStarted => Container( DiaryStateEnum.lastDayStarted => Container(
width: 8, width: 8,
height: 8, height: 8,
decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[1]), decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[1]),
), ),
DiaryStateEnum.finished => Container( DiaryStateEnum.finished => Container(
width: 8, width: 8,
height: 8, height: 8,
decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[2]), decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[2]),
), ),
DiaryStateEnum.lastDayFinished => Container( DiaryStateEnum.lastDayFinished => Container(
width: 8, width: 8,
height: 8, height: 8,
decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[2]), decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[2]),
), ),
DiaryStateEnum.commented => Container( DiaryStateEnum.commented => Container(
width: 8, width: 8,
height: 8, height: 8,
decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[3]), decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[3]),
), ),
DiaryStateEnum.lastDayCommented => Container( DiaryStateEnum.lastDayCommented => Container(
width: 8, width: 8,
height: 8, height: 8,
decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[3]), decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[3]),
), ),
DiaryStateEnum.reviewedByUser => Container( DiaryStateEnum.reviewedByUser => Container(
width: 8, width: 8,
height: 8, height: 8,
decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[4]), decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[4]),
), ),
}, },
const SizedBox( const SizedBox(height: 12),
height: 12,
),
] else ] else
const SizedBox( const SizedBox(height: 24),
height: 24,
),
], ],
), ),
); );
@@ -280,11 +238,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
const SizedBox(height: 12), const SizedBox(height: 12),
Text( Text(
'${widget.consultationsModel.consultationOptionPrice.toStringAsFixed(0)} ₽', '${widget.consultationsModel.consultationOptionPrice.toStringAsFixed(0)} ₽',
style: const TextStyle( style: const TextStyle(color: Color(0xFF019A3E), fontSize: 20, fontWeight: FontWeight.w600),
color: Color(0xFF019A3E),
fontSize: 20,
fontWeight: FontWeight.w600,
),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
Row( Row(
@@ -293,35 +247,26 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
onTap: () { onTap: () {
final lastActiveDay = givenDaysWithDayNumber final lastActiveDay = givenDaysWithDayNumber
.where( .where((e) => e.$2.state == DiaryStateEnum.finished || e.$2.state == DiaryStateEnum.lastDayFinished)
(e) => e.$2.state == DiaryStateEnum.finished || e.$2.state == DiaryStateEnum.lastDayFinished,
)
.lastOrNull; .lastOrNull;
if (lastActiveDay != null) { if (lastActiveDay != null) {
GoRouter.of(context).push(UserDiaryScreen.path, extra: { GoRouter.of(context).push(UserDiaryScreen.path, extra: {'diaryId': lastActiveDay.$2.id, 'currentDiaryDay': lastActiveDay.$1});
'diaryId': lastActiveDay.$2.id,
'currentDiaryDay': lastActiveDay.$1,
});
return; return;
} }
showErrorDialog(context, showErrorDialog(
title: s.you_can_not_open_this_day, description: '${widget.consultationsModel.userName} ${s.has_not_filled_it_yet}'); context,
title: s.you_can_not_open_this_day,
description: '${widget.consultationsModel.userName} ${s.has_not_filled_it_yet}',
);
}, },
child: Ink( child: Ink(
width: MediaQuery.of(context).size.width - 32 - 52 - 8, width: MediaQuery.of(context).size.width - 32 - 52 - 8,
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
decoration: BoxDecoration( decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
borderRadius: BorderRadius.circular(20),
color: appTheme.blueA400,
),
child: const Center( child: const Center(
child: Text( child: Text(
'Комментировать отчёт', 'Комментировать отчёт',
style: TextStyle( style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w600),
color: Colors.white,
fontSize: 16,
fontWeight: FontWeight.w600,
),
), ),
), ),
), ),
@@ -333,16 +278,8 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
child: Ink( child: Ink(
height: 52, height: 52,
width: 52, width: 52,
decoration: BoxDecoration( decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: const Color(0xFFF6F6F6)),
borderRadius: BorderRadius.circular(20), child: const Center(child: Icon(Icons.chat_outlined, size: 24)),
color: const Color(0xFFF6F6F6),
),
child: const Center(
child: Icon(
Icons.chat_outlined,
size: 24,
),
),
), ),
), ),
], ],
@@ -360,21 +297,13 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
Container( Container(
height: 20, height: 20,
width: 20, width: 20,
decoration: BoxDecoration( decoration: BoxDecoration(shape: BoxShape.circle, color: color),
shape: BoxShape.circle,
color: color,
),
), ),
const SizedBox(width: 12), const SizedBox(width: 12),
Flexible( Flexible(
child: Text( child: Text(
text, text,
style: const TextStyle( style: const TextStyle(height: 1, fontSize: 16, fontWeight: FontWeight.w500, color: Color(0xFF323F4B)),
height: 1,
fontSize: 16,
fontWeight: FontWeight.w500,
color: Color(0xFF323F4B),
),
), ),
), ),
], ],

View File

@@ -9,6 +9,7 @@ import 'package:eatvio_app/core/utils/toasts.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart'; import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart'; import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/dev_tools/test_cases.dart'; import 'package:eatvio_app/features/dev_tools/test_cases.dart';
import 'package:eatvio_app/core/env_config.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@@ -97,10 +98,15 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
padding: const EdgeInsets.symmetric(horizontal: 10), padding: const EdgeInsets.symmetric(horizontal: 10),
child: Column( child: Column(
children: [ children: [
Padding(padding: const EdgeInsets.all(8.0), child: Row(children: [Text('BaseUrl: $baseUrlForTest')])), Padding(
padding: const EdgeInsets.all(8.0),
child: Row(children: [Text('BaseUrl: $baseUrlForTest')]),
),
Row( Row(
children: [ children: [
Expanded(child: CustomTextFormField(controller: controller, hintText: 'type new base url')), Expanded(
child: CustomTextFormField(controller: controller, hintText: 'type new base url'),
),
IconButton( IconButton(
onPressed: () { onPressed: () {
setState(() { setState(() {
@@ -116,13 +122,13 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
CustomOutlinedButton( CustomOutlinedButton(
text: baseUrl == 'https://dev2.eatvio.com' ? 'Set production base url' : 'Set dev2 base url', text: baseUrl == EnvConfig.devBaseUrl ? 'Set production base url' : 'Set dev2 base url',
onPressed: () { onPressed: () {
setState(() { setState(() {
if (baseUrl == 'https://eatvio.ru') { if (baseUrl == EnvConfig.baseUrl) {
baseUrlForTest = 'https://dev2.eatvio.com'; baseUrlForTest = EnvConfig.devBaseUrl;
} else { } else {
baseUrlForTest = 'https://eatvio.ru'; baseUrlForTest = EnvConfig.baseUrl;
} }
baseUrl = baseUrlForTest.toLowerCase(); baseUrl = baseUrlForTest.toLowerCase();
sl<Dio>().options.baseUrl = baseUrl; sl<Dio>().options.baseUrl = baseUrl;
@@ -132,7 +138,7 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
buttonStyle: const ButtonStyle(), buttonStyle: const ButtonStyle(),
), ),
SizedBox(height: baseUrlForTest != baseUrl ? 40 : 10), SizedBox(height: baseUrlForTest != baseUrl ? 40 : 10),
if (baseUrl.toLowerCase() != 'https://eatvio.ru') if (baseUrl.toLowerCase() != EnvConfig.baseUrl.toLowerCase())
ListView.builder( ListView.builder(
shrinkWrap: true, shrinkWrap: true,
itemCount: testCases.length, itemCount: testCases.length,
@@ -175,12 +181,7 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
builder: (context) => AlertDialog( builder: (context) => AlertDialog(
title: const Text('Test Failed'), title: const Text('Test Failed'),
content: SingleChildScrollView(child: Text(result.error ?? 'No error details.')), content: SingleChildScrollView(child: Text(result.error ?? 'No error details.')),
actions: [ actions: [TextButton(onPressed: () => Navigator.of(context).pop(), child: const Text('OK'))],
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: const Text('OK'),
),
],
), ),
); );
} }
@@ -197,12 +198,7 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
builder: (context) => AlertDialog( builder: (context) => AlertDialog(
title: const Text('Test Failed'), title: const Text('Test Failed'),
content: SingleChildScrollView(child: Text('$e\n$stack')), content: SingleChildScrollView(child: Text('$e\n$stack')),
actions: [ actions: [TextButton(onPressed: () => Navigator.of(context).pop(), child: const Text('OK'))],
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: const Text('OK'),
),
],
), ),
); );
} }
@@ -216,10 +212,10 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
TestState.fail => Container(width: 20, height: 20, color: Colors.red), TestState.fail => Container(width: 20, height: 20, color: Colors.red),
TestState.notRun => Container(width: 20, height: 20, color: Colors.grey), TestState.notRun => Container(width: 20, height: 20, color: Colors.grey),
TestState.loading => const SizedBox( TestState.loading => const SizedBox(
width: 20, width: 20,
height: 20, height: 20,
child: SizedBox(height: 20, width: 20, child: Center(child: CircularProgressIndicator())), child: SizedBox(height: 20, width: 20, child: Center(child: CircularProgressIndicator())),
), ),
}, },
], ],
), ),

View File

@@ -35,6 +35,7 @@ import 'package:eatvio_app/features/recipe/services/about_recipe_service.dart';
import 'package:eatvio_app/features/recipe/services/my_recipes_service.dart'; import 'package:eatvio_app/features/recipe/services/my_recipes_service.dart';
import 'package:eatvio_app/features/registration/services/registration_service.dart'; import 'package:eatvio_app/features/registration/services/registration_service.dart';
import 'package:eatvio_app/features/settings/services/settings_service.dart'; import 'package:eatvio_app/features/settings/services/settings_service.dart';
import 'package:eatvio_app/core/env_config.dart';
class TestResult { class TestResult {
final bool success; final bool success;
@@ -477,7 +478,9 @@ class AuthServiceTest implements TestCases {
final dio = sl<Dio>(); final dio = sl<Dio>();
final authService = AuthService(dio, baseUrl: baseUrl); final authService = AuthService(dio, baseUrl: baseUrl);
// Use dummy credentials, expecting failure but no crash // Use dummy credentials, expecting failure but no crash
await authService.getTokenByCredentials(credentials: const CredentialsModel(email: 'reshetnick.mike+user1@gmail.com', password: '1234567890')); await authService.getTokenByCredentials(
credentials: CredentialsModel(email: EnvConfig.testEmail, password: EnvConfig.testPassword),
);
return TestResult(false, 'Should not succeed'); return TestResult(false, 'Should not succeed');
} catch (e) { } catch (e) {
return TestResult(true, 'Exception expected for dummy credentials'); return TestResult(true, 'Exception expected for dummy credentials');

View File

@@ -10,6 +10,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart'; import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:eatvio_app/core/env_config.dart';
class InternetConnectionCheckerScreen extends StatefulWidget { class InternetConnectionCheckerScreen extends StatefulWidget {
const InternetConnectionCheckerScreen({super.key, required this.child}); const InternetConnectionCheckerScreen({super.key, required this.child});
@@ -66,12 +67,7 @@ class _InternetConnectionCheckerScreenState extends State<InternetConnectionChec
return false; return false;
} }
final uris = [ final uris = [Uri.parse(EnvConfig.googleCheckUrl), Uri.parse(EnvConfig.yandexCheckUrl), Uri.parse(EnvConfig.devBaseUrl), Uri.parse(EnvConfig.baseUrl)];
Uri.parse('https://google.com'),
Uri.parse('https://yandex.ru'),
Uri.parse('https://dev2.eatvio.com'),
Uri.parse('https://eatvio.ru'),
];
for (final uri in uris) { for (final uri in uris) {
try { try {
final response = await http.get(uri).timeout(const Duration(seconds: 3)); final response = await http.get(uri).timeout(const Duration(seconds: 3));
@@ -98,13 +94,9 @@ class _InternetConnectionCheckerScreenState extends State<InternetConnectionChec
if (!_hasInternet) if (!_hasInternet)
NoInternetScreen( NoInternetScreen(
onTryAgain: () async { onTryAgain: () async {
EasyDebounce.debounce( EasyDebounce.debounce('internet connection check', const Duration(seconds: 2), () async {
'internet connection check', await _checkConnection();
const Duration(seconds: 2), });
() async {
await _checkConnection();
},
);
}, },
), ),
], ],
@@ -129,9 +121,7 @@ class NoInternetScreen extends StatelessWidget {
child: Text( child: Text(
'Отсутствует подключение \nк интернету', 'Отсутствует подключение \nк интернету',
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyles.headingXLSemibold.copyWith( style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
color: appTheme.black,
),
), ),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
@@ -140,9 +130,7 @@ class NoInternetScreen extends StatelessWidget {
child: Text( child: Text(
'Проверьте соединение с сетью\nи попробуйте ещё раз', 'Проверьте соединение с сетью\nи попробуйте ещё раз',
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyles.textMMedium.copyWith( style: TextStyles.textMMedium.copyWith(color: appTheme.gray),
color: appTheme.gray,
),
), ),
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
@@ -153,10 +141,7 @@ class NoInternetScreen extends StatelessWidget {
height: 52, height: 52,
text: 'Попробовать ещё раз', text: 'Попробовать ещё раз',
buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700), buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
buttonStyle: ButtonStyle( buttonStyle: ButtonStyle(backgroundColor: WidgetStatePropertyAll(appTheme.blueA400), side: const WidgetStatePropertyAll(BorderSide.none)),
backgroundColor: WidgetStatePropertyAll(appTheme.blueA400),
side: const WidgetStatePropertyAll(BorderSide.none),
),
), ),
), ),
const Spacer(), const Spacer(),

View File

@@ -3,6 +3,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/features/registration/models/user_registration_model.dart'; import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
import 'package:eatvio_app/features/registration/models/location_model.dart'; import 'package:eatvio_app/features/registration/models/location_model.dart';
import 'package:eatvio_app/features/registration/services/registration_service.dart'; import 'package:eatvio_app/features/registration/services/registration_service.dart';
import 'package:eatvio_app/core/env_config.dart';
class RegistrationRepository { class RegistrationRepository {
final RegistrationService registrationService; final RegistrationService registrationService;
@@ -83,7 +84,7 @@ class RegistrationRepository {
Future<bool> emailIsReachable(String email) async { Future<bool> emailIsReachable(String email) async {
try { try {
final response = await sl<Dio>().getUri(Uri.parse('https://api.validate.email/validate?email=$email')); final response = await sl<Dio>().getUri(Uri.parse('${EnvConfig.emailValidationApiUrl}?email=$email'));
if (response.data['result']['reachable'] != 'invalid') { if (response.data['result']['reachable'] != 'invalid') {
return true; return true;
} else { } else {

View File

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import 'package:eatvio_app/core/env_config.dart';
class SupportScreen extends StatelessWidget { class SupportScreen extends StatelessWidget {
const SupportScreen({super.key}); const SupportScreen({super.key});
@@ -15,48 +16,28 @@ class SupportScreen extends StatelessWidget {
final s = S.of(context); final s = S.of(context);
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(title: const Text('Поддержка')),
title: const Text('Поддержка'),
),
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const Padding( const Padding(
padding: EdgeInsets.all(16), padding: EdgeInsets.all(16),
child: Text( child: Text('Если у вас есть вопросы по работе нашего приложения, вы можете задать их, перейдя по ссылке:', style: TextStyle(fontSize: 16)),
'Если у вас есть вопросы по работе нашего приложения, вы можете задать их, перейдя по ссылке:',
style: TextStyle(
fontSize: 16,
),
),
), ),
InkWell( InkWell(
onTap: () { onTap: () {
launchUrl( launchUrl(Uri.parse(EnvConfig.telegramSupportUrl), mode: LaunchMode.externalApplication);
Uri.parse('https://t.me/eatvio'),
mode: LaunchMode.externalApplication,
);
}, },
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
child: Ink( child: Ink(
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(borderRadius: BorderRadius.circular(16)),
borderRadius: BorderRadius.circular(16),
),
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Row( child: Row(
children: [ children: [
SvgPicture.asset( SvgPicture.asset('assets/icons/telegram.svg', colorFilter: const ColorFilter.mode(Colors.black, BlendMode.srcIn)),
'assets/icons/telegram.svg',
colorFilter: const ColorFilter.mode(Colors.black, BlendMode.srcIn),
),
const SizedBox(width: 12), const SizedBox(width: 12),
const Text( Text('Telegram: ${EnvConfig.telegramSupportUrl.replaceFirst('https://', '')}', style: const TextStyle(fontSize: 16)),
'Telegram: t.me/eatvio',
style: TextStyle(
fontSize: 16,
),
),
], ],
), ),
), ),
@@ -64,26 +45,19 @@ class SupportScreen extends StatelessWidget {
const SizedBox(height: 8), const SizedBox(height: 8),
InkWell( InkWell(
onTap: () { onTap: () {
Clipboard.setData(const ClipboardData(text: 'help@eatv.io')); Clipboard.setData(ClipboardData(text: EnvConfig.supportEmail));
showInfoToast(s.mail_was_copied); showInfoToast(s.mail_was_copied);
}, },
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
child: Ink( child: Ink(
decoration: BoxDecoration( decoration: BoxDecoration(borderRadius: BorderRadius.circular(16)),
borderRadius: BorderRadius.circular(16),
),
width: double.infinity, width: double.infinity,
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: const Row( child: Row(
children: [ children: [
Icon(Icons.alternate_email_rounded), const Icon(Icons.alternate_email_rounded),
SizedBox(width: 12), const SizedBox(width: 12),
Text( Text('E-mail: ${EnvConfig.supportEmail}', style: const TextStyle(fontSize: 16)),
'E-mail: help@eatv.io',
style: TextStyle(
fontSize: 16,
),
),
], ],
), ),
), ),
@@ -92,13 +66,7 @@ class SupportScreen extends StatelessWidget {
const SizedBox(height: 16), const SizedBox(height: 16),
const Padding( const Padding(
padding: EdgeInsets.symmetric(horizontal: 16), padding: EdgeInsets.symmetric(horizontal: 16),
child: Text( child: Text('Правовые документы', style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500)),
'Правовые документы',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
), ),
const SizedBox(height: 12), const SizedBox(height: 12),
InkWell( InkWell(
@@ -106,12 +74,7 @@ class SupportScreen extends StatelessWidget {
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
child: const Padding( child: const Padding(
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 4), padding: EdgeInsets.symmetric(horizontal: 16, vertical: 4),
child: Text( child: Text('Публичная офёрта', style: TextStyle(fontSize: 16)),
'Публичная офёрта',
style: TextStyle(
fontSize: 16,
),
),
), ),
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
@@ -120,12 +83,7 @@ class SupportScreen extends StatelessWidget {
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
child: const Padding( child: const Padding(
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 4), padding: EdgeInsets.symmetric(horizontal: 16, vertical: 4),
child: Text( child: Text('Политика конфиденциальности', style: TextStyle(fontSize: 16)),
'Политика конфиденциальности',
style: TextStyle(
fontSize: 16,
),
),
), ),
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
@@ -134,12 +92,7 @@ class SupportScreen extends StatelessWidget {
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
child: const Padding( child: const Padding(
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 4), padding: EdgeInsets.symmetric(horizontal: 16, vertical: 4),
child: Text( child: Text('О компании', style: TextStyle(fontSize: 16)),
'О компании',
style: TextStyle(
fontSize: 16,
),
),
), ),
), ),
], ],

View File

@@ -6,6 +6,7 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import '../../../../core/theme/theme_helper.dart'; import '../../../../core/theme/theme_helper.dart';
import '../../../../core/env_config.dart';
class UpdateScreen extends StatelessWidget { class UpdateScreen extends StatelessWidget {
const UpdateScreen({super.key}); const UpdateScreen({super.key});
@@ -17,16 +18,7 @@ class UpdateScreen extends StatelessWidget {
body: Stack( body: Stack(
clipBehavior: Clip.none, clipBehavior: Clip.none,
children: [ children: [
Positioned( Positioned(left: -20, top: -20, right: -20, bottom: -20, child: Image.asset('assets/images/bg_welcome.png', fit: BoxFit.cover)),
left: -20,
top: -20,
right: -20,
bottom: -20,
child: Image.asset(
'assets/images/bg_welcome.png',
fit: BoxFit.cover,
),
),
Positioned.fill( Positioned.fill(
child: SafeArea( child: SafeArea(
child: Padding( child: Padding(
@@ -48,47 +40,26 @@ class UpdateScreen extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const SizedBox(height: 16), const SizedBox(height: 16),
const Text( const Text('Пора обновиться! ⚡', style: TextStyle(fontSize: 28, fontWeight: FontWeight.w800, height: 1)),
'Пора обновиться! ⚡',
style: TextStyle(
fontSize: 28,
fontWeight: FontWeight.w800,
height: 1,
),
),
const SizedBox(height: 20), const SizedBox(height: 20),
const Text( const Text(
'Мы выпустили важное обновление\nс новыми функциями и исправлениями.\nЧтобы продолжить пользоваться\nприложением без сбоев, обновите\nего прямо сейчас.', 'Мы выпустили важное обновление\nс новыми функциями и исправлениями.\nЧтобы продолжить пользоваться\nприложением без сбоев, обновите\nего прямо сейчас.',
style: TextStyle( style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500, height: 1.15),
fontSize: 16,
fontWeight: FontWeight.w500,
height: 1.15,
),
), ),
const SizedBox(height: 32), const SizedBox(height: 32),
InkWell( InkWell(
onTap: () async { onTap: () async {
final Uri url = Platform.isAndroid final Uri url = Platform.isAndroid ? Uri.parse(EnvConfig.rustoreUrl) : Uri.parse(EnvConfig.appStoreUrl);
? Uri.parse('https://www.rustore.ru/catalog/app/com.eatvioapp.app')
: Uri.parse('https://apps.apple.com/app/idYOUR_APP_ID');
await launchUrl(url); await launchUrl(url);
}, },
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
child: Ink( child: Ink(
height: 52, height: 52,
decoration: BoxDecoration( decoration: BoxDecoration(color: appTheme.blueA400, borderRadius: BorderRadius.circular(8)),
color: appTheme.blueA400,
borderRadius: BorderRadius.circular(8),
),
child: const Center( child: const Center(
child: Text( child: Text(
'Обновить', 'Обновить',
style: TextStyle( style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, height: 1, color: Colors.white),
fontSize: 16,
fontWeight: FontWeight.w600,
height: 1,
color: Colors.white,
),
), ),
), ),
), ),

View File

@@ -20,19 +20,11 @@ class UserDetailsCubit extends Cubit<UserDetailsState> {
} }
} }
void getChartData({ void getChartData({String period = '1', required String slug}) async {
String period = '1',
required String slug,
}) async {
try { try {
final weightPoints = await profileRepository.getWeight(period: period); final weightPoints = await profileRepository.getWeight(period: period, slug: slug);
final circumferencePoints = await profileRepository.getCircumferences(period: period); final circumferencePoints = await profileRepository.getCircumferences(period: period, slug: slug);
emit( emit(state.copyWith(weightPoints: weightPoints, circumferencePoints: circumferencePoints));
state.copyWith(
weightPoints: weightPoints,
circumferencePoints: circumferencePoints,
),
);
} catch (e, stackTrace) { } catch (e, stackTrace) {
log(e.toString(), stackTrace: stackTrace); log(e.toString(), stackTrace: stackTrace);
emit(state.copyWith(error: e.toString(), isLoading: false)); emit(state.copyWith(error: e.toString(), isLoading: false));

View File

@@ -31,9 +31,7 @@ class UserDetailsScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BlocProvider( return BlocProvider(
create: (context) => sl<UserDetailsCubit>()..getUserDetails(slug), create: (context) => sl<UserDetailsCubit>()..getUserDetails(slug),
child: UserDetailsContent( child: UserDetailsContent(slug: slug),
slug: slug,
),
); );
} }
} }
@@ -79,27 +77,15 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
actions: [ actions: [
PortalTarget( PortalTarget(
visible: isMoreOptionsVisible, visible: isMoreOptionsVisible,
portalFollower: MoreOptions( portalFollower: MoreOptions(path: 'profile/${widget.slug}', complainedContentType: ComplainedContent.profile, slug: widget.slug),
path: 'profile/${widget.slug}', anchor: const Aligned(shiftToWithinBound: AxisFlag(x: true, y: true), follower: Alignment.topRight, target: Alignment.bottomRight),
complainedContentType: ComplainedContent.profile,
slug: widget.slug,
),
anchor: const Aligned(
shiftToWithinBound: AxisFlag(x: true, y: true),
follower: Alignment.topRight,
target: Alignment.bottomRight,
),
child: IconButton( child: IconButton(
onPressed: () { onPressed: () {
setState(() { setState(() {
isMoreOptionsVisible = !isMoreOptionsVisible; isMoreOptionsVisible = !isMoreOptionsVisible;
}); });
}, },
icon: SvgPicture.asset( icon: SvgPicture.asset('assets/icons/more_button.svg', width: 20, height: 20),
'assets/icons/more_button.svg',
width: 20,
height: 20,
),
), ),
), ),
], ],
@@ -124,25 +110,16 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
initiallyExpanded: true, initiallyExpanded: true,
title: s.general_info, title: s.general_info,
children: [ children: [
Text( Text(s.date_of_birth, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.date_of_birth,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(
readOnly: true, readOnly: true,
controller: TextEditingController(text: DateTime.parse(profileDetails.birthdate).format('dd.MM.yyyy')), controller: TextEditingController(text: DateTime.parse(profileDetails.birthdate).format('dd.MM.yyyy')),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
Text( Text(s.sex, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.sex,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.gender.parseGender())),
readOnly: true,
controller: TextEditingController(text: profileDetails.gender.parseGender()),
),
const SizedBox(height: 16), const SizedBox(height: 16),
], ],
), ),
@@ -155,15 +132,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(s.height, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.height,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.height.toString())),
readOnly: true,
controller: TextEditingController(text: profileDetails.height.toString()),
),
], ],
), ),
), ),
@@ -172,15 +143,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(s.weight, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.weight,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.weight.toStringAsFixed(0))),
readOnly: true,
controller: TextEditingController(text: profileDetails.weight.toStringAsFixed(0)),
),
], ],
), ),
), ),
@@ -193,15 +158,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(s.chest_circumference, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.chest_circumference,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.chestCircumference.toString())),
readOnly: true,
controller: TextEditingController(text: profileDetails.chestCircumference.toString()),
),
], ],
), ),
), ),
@@ -210,15 +169,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(s.waist_circumference, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.waist_circumference,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.waistCircumference.toString())),
readOnly: true,
controller: TextEditingController(text: profileDetails.waistCircumference.toString()),
),
], ],
), ),
), ),
@@ -227,15 +180,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(s.hip_circumference, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.hip_circumference,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.hipCircumference.toString())),
readOnly: true,
controller: TextEditingController(text: profileDetails.hipCircumference.toString()),
),
], ],
), ),
), ),
@@ -253,15 +200,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(s.upper, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.upper,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.bloodPressureUp.toString())),
readOnly: true,
controller: TextEditingController(text: profileDetails.bloodPressureUp.toString()),
),
], ],
), ),
), ),
@@ -270,10 +211,7 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(s.lower, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.lower,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(
readOnly: true, readOnly: true,
@@ -291,15 +229,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(s.has_hypo, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.has_hypo,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.hasHypo.toString())),
readOnly: true,
controller: TextEditingController(text: profileDetails.hasHypo.toString()),
),
], ],
), ),
), ),
@@ -308,15 +240,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(s.has_hyper, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.has_hyper,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.hasHyper.toString())),
readOnly: true,
controller: TextEditingController(text: profileDetails.hasHyper.toString()),
),
], ],
), ),
), ),
@@ -328,60 +254,27 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
ExpandableBouble( ExpandableBouble(
title: s.other_info, title: s.other_info,
children: [ children: [
Text( Text(s.has_alergy, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.has_alergy,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.aboutAlergy)),
readOnly: true,
controller: TextEditingController(text: profileDetails.aboutAlergy),
),
const SizedBox(height: 16), const SizedBox(height: 16),
Text( Text(s.takes_pills, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.takes_pills,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.aboutTakingPils)),
readOnly: true,
controller: TextEditingController(text: profileDetails.aboutTakingPils),
),
const SizedBox(height: 16), const SizedBox(height: 16),
Text( Text(s.sport_hobbies, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.sport_hobbies,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.aboutSportHobbies)),
readOnly: true,
controller: TextEditingController(text: profileDetails.aboutSportHobbies),
),
const SizedBox(height: 16), const SizedBox(height: 16),
Text( Text(s.liked_groceries, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.liked_groceries,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.favoriteFoods)),
readOnly: true,
controller: TextEditingController(text: profileDetails.favoriteFoods),
),
const SizedBox(height: 16), const SizedBox(height: 16),
Text( Text(s.not_liked_groceries, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.not_liked_groceries,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
CustomTextFormField( CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.unfavoriteFoods)),
readOnly: true,
controller: TextEditingController(text: profileDetails.unfavoriteFoods),
),
const SizedBox(height: 16), const SizedBox(height: 16),
Text( Text(s.additional_information, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
s.additional_information,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 4), const SizedBox(height: 4),
SizedBox( SizedBox(
height: 112, height: 112,
@@ -413,10 +306,7 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
), ),
); );
} }
return Scaffold( return Scaffold(appBar: AppBar(), body: const Loader());
appBar: AppBar(),
body: const Loader(),
);
}, },
); );
} }
@@ -432,31 +322,17 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
SingleChildScrollView( SingleChildScrollView(
padding: const EdgeInsets.symmetric(horizontal: 16), padding: const EdgeInsets.symmetric(horizontal: 16),
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
child: Row( child: Row(children: [_choiceChipWidget(0), const SizedBox(width: 8), _choiceChipWidget(1), const SizedBox(width: 8), _choiceChipWidget(2)]),
children: [
_choiceChipWidget(0),
const SizedBox(width: 8),
_choiceChipWidget(1),
const SizedBox(width: 8),
_choiceChipWidget(2),
],
),
), ),
Builder( Builder(
builder: (context) { builder: (context) {
switch (_selectedChipIndex) { switch (_selectedChipIndex) {
case 0: case 0:
return WeightChartWidget( return WeightChartWidget(weightPoints: weightPoints);
weightPoints: weightPoints,
);
case 1: case 1:
return CircumferenceChartWidget( return CircumferenceChartWidget(circumferencePoints: circumferencePoints);
circumferencePoints: circumferencePoints,
);
case 2: case 2:
return ImtChartWidget( return ImtChartWidget(weightPoints: weightPoints);
weightPoints: weightPoints,
);
default: default:
return const SizedBox.shrink(); return const SizedBox.shrink();
} }
@@ -489,16 +365,10 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
pressElevation: 0, pressElevation: 0,
showCheckmark: false, showCheckmark: false,
side: BorderSide.none, side: BorderSide.none,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
borderRadius: BorderRadius.circular(16),
),
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
label: Text(chipsIntervalLabelList[index]), label: Text(chipsIntervalLabelList[index]),
labelStyle: TextStyle( labelStyle: TextStyle(color: appTheme.gray600, fontWeight: FontWeight.w500, fontSize: 12),
color: appTheme.gray600,
fontWeight: FontWeight.w500,
fontSize: 12,
),
selected: _selectedIntervalChipIndex == index, selected: _selectedIntervalChipIndex == index,
onSelected: (bool selected) { onSelected: (bool selected) {
context.read<UserDetailsCubit>().getChartData(period: chipsIntervalList[index], slug: widget.slug); context.read<UserDetailsCubit>().getChartData(period: chipsIntervalList[index], slug: widget.slug);
@@ -515,16 +385,10 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
pressElevation: 0, pressElevation: 0,
showCheckmark: false, showCheckmark: false,
side: BorderSide.none, side: BorderSide.none,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
borderRadius: BorderRadius.circular(16),
),
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
label: Text(chipsLabelList[index]), label: Text(chipsLabelList[index]),
labelStyle: TextStyle( labelStyle: TextStyle(color: index == _selectedChipIndex ? Colors.white : appTheme.gray600, fontWeight: FontWeight.w500, fontSize: 12),
color: index == _selectedChipIndex ? Colors.white : appTheme.gray600,
fontWeight: FontWeight.w500,
fontSize: 12,
),
selected: _selectedChipIndex == index, selected: _selectedChipIndex == index,
backgroundColor: appTheme.gray100, backgroundColor: appTheme.gray100,
onSelected: (bool selected) { onSelected: (bool selected) {

View File

@@ -1,8 +1,8 @@
// File generated by FlutterFire CLI. // File generated by FlutterFire CLI.
// ignore_for_file: type=lint // ignore_for_file: type=lint
import 'package:firebase_core/firebase_core.dart' show FirebaseOptions; import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
import 'package:flutter/foundation.dart' import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform;
show defaultTargetPlatform, kIsWeb, TargetPlatform; import 'package:eatvio_app/core/env_config.dart';
/// Default [FirebaseOptions] for use with your Firebase apps. /// Default [FirebaseOptions] for use with your Firebase apps.
/// ///
@@ -43,28 +43,26 @@ class DefaultFirebaseOptions {
'you can reconfigure this by running the FlutterFire CLI again.', 'you can reconfigure this by running the FlutterFire CLI again.',
); );
default: default:
throw UnsupportedError( throw UnsupportedError('DefaultFirebaseOptions are not supported for this platform.');
'DefaultFirebaseOptions are not supported for this platform.',
);
} }
} }
static const FirebaseOptions android = FirebaseOptions( static FirebaseOptions get android => FirebaseOptions(
apiKey: 'AIzaSyBUe1UqAAMfgMcd4hWdRoLF1Os-yn-HE9k', apiKey: EnvConfig.firebaseAndroidApiKey,
appId: '1:613980912922:android:4de95e5f2d50ba69ecc0a3', appId: EnvConfig.firebaseAndroidAppId,
messagingSenderId: '613980912922', messagingSenderId: EnvConfig.firebaseMessagingSenderId,
projectId: 'eatvio-3467b', projectId: EnvConfig.firebaseProjectId,
databaseURL: 'https://eatvio-3467b-default-rtdb.europe-west1.firebasedatabase.app', databaseURL: EnvConfig.firebaseDatabaseUrl,
storageBucket: 'eatvio-3467b.firebasestorage.app', storageBucket: EnvConfig.firebaseStorageBucket,
); );
static const FirebaseOptions ios = FirebaseOptions( static FirebaseOptions get ios => FirebaseOptions(
apiKey: 'AIzaSyBnE8tQjL9_1HuXrTnqNy6qbXpoenO36yQ', apiKey: EnvConfig.firebaseIosApiKey,
appId: '1:613980912922:ios:c557d140a1212e63ecc0a3', appId: EnvConfig.firebaseIosAppId,
messagingSenderId: '613980912922', messagingSenderId: EnvConfig.firebaseMessagingSenderId,
projectId: 'eatvio-3467b', projectId: EnvConfig.firebaseProjectId,
databaseURL: 'https://eatvio-3467b-default-rtdb.europe-west1.firebasedatabase.app', databaseURL: EnvConfig.firebaseDatabaseUrl,
storageBucket: 'eatvio-3467b.firebasestorage.app', storageBucket: EnvConfig.firebaseStorageBucket,
iosBundleId: 'com.eatvioapp.app', iosBundleId: EnvConfig.firebaseIosBundleId,
); );
} }

View File

@@ -1,3 +1,4 @@
import 'dart:io' as io;
import 'package:eatvio_app/core/app_router.dart'; import 'package:eatvio_app/core/app_router.dart';
import 'package:eatvio_app/core/locator_service.dart' as di; import 'package:eatvio_app/core/locator_service.dart' as di;
import 'package:eatvio_app/core/locator_service.dart'; import 'package:eatvio_app/core/locator_service.dart';
@@ -12,6 +13,7 @@ import 'package:eatvio_app/firebase_options.dart';
import 'package:eatvio_app/generated/l10n.dart'; import 'package:eatvio_app/generated/l10n.dart';
import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart';
@@ -19,22 +21,28 @@ import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:flutter_portal/flutter_portal.dart'; import 'package:flutter_portal/flutter_portal.dart';
import 'package:keyboard_dismisser/keyboard_dismisser.dart'; import 'package:keyboard_dismisser/keyboard_dismisser.dart';
import 'package:sentry_flutter/sentry_flutter.dart'; import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:eatvio_app/core/env_config.dart';
Future<void> main() async { Future<void> main() async {
WidgetsBinding widgetsBinding = SentryWidgetsFlutterBinding.ensureInitialized(); WidgetsBinding widgetsBinding = SentryWidgetsFlutterBinding.ensureInitialized();
FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding); FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
await dotenv.load(fileName: "env/.env");
await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
await FirebaseMessaging.instance.requestPermission(); await FirebaseMessaging.instance.requestPermission();
await di.init(); await di.init();
await SentryFlutter.init( if (kDebugMode) {
(options) { io.HttpClient.enableTimelineLogging = true;
options.dsn = 'http://ba7f2653067776f3034e6e89850e85a1@sentry.md-desk.ru:9000/2'; }
options.tracesSampleRate = 1.0;
options.debug = false; await SentryFlutter.init((options) {
}, options.dsn = EnvConfig.sentryDsn;
appRunner: () => runApp(const MyApp()), options.tracesSampleRate = 1.0;
); options.debug = false;
}, appRunner: () => runApp(const MyApp()));
} }
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {

View File

@@ -72,6 +72,7 @@ dependencies:
device_info_plus: ^11.5.0 device_info_plus: ^11.5.0
permission_handler: ^12.0.1 permission_handler: ^12.0.1
qr_code_scanner_plus: ^2.0.10+1 qr_code_scanner_plus: ^2.0.10+1
flutter_dotenv: ^5.1.0
dev_dependencies: dev_dependencies:
build_runner: ^2.6.0 build_runner: ^2.6.0
@@ -88,6 +89,7 @@ dev_dependencies:
flutter: flutter:
uses-material-design: true uses-material-design: true
assets: assets:
- env/.env
- assets/ - assets/
- assets/images/ - assets/images/
- assets/audio/ - assets/audio/