forked from eatvio/eatvio_app
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1b948b99e3 | ||
|
|
b6eac3c46f | ||
|
|
39775cd7a8 | ||
|
|
36e2f12e3f | ||
|
|
66d2533add | ||
|
|
425f16bfc9 | ||
|
|
c5e30d8f00 | ||
|
|
d0935fbaae | ||
| dda0aa7440 | |||
|
|
c81327b895 | ||
| 732d667ac1 |
@@ -19,15 +19,15 @@ def yandexClientId = project.hasProperty('YANDEX_CLIENT_ID') ? project.property(
|
|||||||
android {
|
android {
|
||||||
namespace = "com.eatvioapp.app"
|
namespace = "com.eatvioapp.app"
|
||||||
compileSdk = flutter.compileSdkVersion
|
compileSdk = flutter.compileSdkVersion
|
||||||
ndkVersion = "27.0.12077973"
|
ndkVersion = flutter.ndkVersion
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility = JavaVersion.VERSION_11
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
targetCompatibility = JavaVersion.VERSION_11
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = JavaVersion.VERSION_11.toString()
|
jvmTarget = JavaVersion.VERSION_17.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
|
|||||||
@@ -406,7 +406,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/Flutter",
|
"$(PROJECT_DIR)/Flutter",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.3.3;
|
MARKETING_VERSION = 1.3.4;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
|
PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
|
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
|
||||||
@@ -557,7 +557,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/Flutter",
|
"$(PROJECT_DIR)/Flutter",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.3.3;
|
MARKETING_VERSION = 1.3.4;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
|
PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
|
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
|
||||||
@@ -596,7 +596,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/Flutter",
|
"$(PROJECT_DIR)/Flutter",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.3.3;
|
MARKETING_VERSION = 1.3.4;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
|
PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
|
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>????</string>
|
<string>????</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>82</string>
|
<string>83</string>
|
||||||
<key>ITSAppUsesNonExemptEncryption</key>
|
<key>ITSAppUsesNonExemptEncryption</key>
|
||||||
<false/>
|
<false/>
|
||||||
<key>LSRequiresIPhoneOS</key>
|
<key>LSRequiresIPhoneOS</key>
|
||||||
|
|||||||
@@ -63,25 +63,28 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
|
|||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Row(
|
GestureDetector(
|
||||||
children: [
|
onTap: () => GoRouter.of(context).pushNamed('profileScreen', extra: widget.consultationsModel.userSlug),
|
||||||
CircleAvatar(radius: 30, backgroundImage: NetworkImage(widget.consultationsModel.userProfilePhotoUrl)),
|
child: Row(
|
||||||
const SizedBox(width: 12),
|
children: [
|
||||||
Column(
|
CircleAvatar(radius: 30, backgroundImage: NetworkImage(widget.consultationsModel.userProfilePhotoUrl)),
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
const SizedBox(width: 12),
|
||||||
children: [
|
Column(
|
||||||
Text(
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
widget.consultationsModel.userName,
|
children: [
|
||||||
style: const TextStyle(height: 1, color: Color(0xFF323F4B), fontSize: 16, fontWeight: FontWeight.w600),
|
Text(
|
||||||
),
|
widget.consultationsModel.userName,
|
||||||
const SizedBox(height: 4),
|
style: const TextStyle(height: 1, color: Color(0xFF323F4B), fontSize: 16, fontWeight: FontWeight.w600),
|
||||||
Text(
|
),
|
||||||
widget.consultationsModel.planTitle,
|
const SizedBox(height: 4),
|
||||||
style: const TextStyle(height: 1, color: Color(0xFF88949F), fontSize: 14, fontWeight: FontWeight.w500),
|
Text(
|
||||||
),
|
widget.consultationsModel.planTitle,
|
||||||
],
|
style: const TextStyle(height: 1, color: Color(0xFF88949F), fontSize: 14, fontWeight: FontWeight.w500),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
GestureDetector(
|
GestureDetector(
|
||||||
|
|||||||
@@ -302,7 +302,10 @@ class CreateDietCubit extends Cubit<CreateDietState> {
|
|||||||
|
|
||||||
Future<String?> createDiet() async {
|
Future<String?> createDiet() async {
|
||||||
emit(state.copyWith(isDietPublishing: true));
|
emit(state.copyWith(isDietPublishing: true));
|
||||||
if (!_isFromValid()) return 'validation';
|
if (!_isFromValid()) {
|
||||||
|
emit(state.copyWith(isDietPublishing: false));
|
||||||
|
return 'validation';
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
File? file;
|
File? file;
|
||||||
if (state.dietData.imageUrl != null) {
|
if (state.dietData.imageUrl != null) {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dar
|
|||||||
import 'package:eatvio_app/features/registration_v2/models/registration_model.dart';
|
import 'package:eatvio_app/features/registration_v2/models/registration_model.dart';
|
||||||
import 'package:eatvio_app/features/registration_v2/repositories/registration_repository_v2.dart';
|
import 'package:eatvio_app/features/registration_v2/repositories/registration_repository_v2.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_password_generator/flutter_password_generator.dart';
|
import 'package:gpassword/gpassword.dart';
|
||||||
|
|
||||||
class RegistrationCubitV2 extends Cubit<RegistrationStateV2> {
|
class RegistrationCubitV2 extends Cubit<RegistrationStateV2> {
|
||||||
final RegistrationRepositoryV2 registrationRepository;
|
final RegistrationRepositoryV2 registrationRepository;
|
||||||
@@ -230,9 +230,8 @@ class RegistrationCubitV2 extends Cubit<RegistrationStateV2> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<String> _generatePassword() async {
|
Future<String> _generatePassword() async {
|
||||||
final generator = FlutterPasswordGenerator(length: 8);
|
final generator = GPassword();
|
||||||
final result = await generator.generatePassword();
|
final password = generator.generate(passwordLength: 10);
|
||||||
final password = result['password'] as String;
|
|
||||||
emit(state.copyWith(password: password));
|
emit(state.copyWith(password: password));
|
||||||
return password;
|
return password;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ class _PasswordFieldState extends State<PasswordField> {
|
|||||||
copied = true;
|
copied = true;
|
||||||
});
|
});
|
||||||
Future.delayed(const Duration(seconds: 3), () {
|
Future.delayed(const Duration(seconds: 3), () {
|
||||||
|
if (!context.mounted) return;
|
||||||
setState(() {
|
setState(() {
|
||||||
copied = false;
|
copied = false;
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import 'package:flutter_portal/flutter_portal.dart';
|
|||||||
import 'package:keyboard_dismisser/keyboard_dismisser.dart';
|
import 'package:keyboard_dismisser/keyboard_dismisser.dart';
|
||||||
|
|
||||||
Future<void> main() async {
|
Future<void> main() async {
|
||||||
await AppInitializer.initialize(buildType: AppBuildType.dev);
|
await AppInitializer.initialize(buildType: AppBuildType.prod);
|
||||||
await AppInitializer.runAppWithSentry(() => runApp(const MyApp()));
|
await AppInitializer.runAppWithSentry(() => runApp(const MyApp()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
29
pubspec.yaml
29
pubspec.yaml
@@ -1,6 +1,6 @@
|
|||||||
name: eatvio_app
|
name: eatvio_app
|
||||||
description: A new Flutter project.
|
description: A new Flutter project.
|
||||||
version: 1.3.3+82
|
version: 1.3.4+83
|
||||||
publish_to: 'none'
|
publish_to: 'none'
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
@@ -25,10 +25,10 @@ dependencies:
|
|||||||
flutter_form_builder: ^10.2.0
|
flutter_form_builder: ^10.2.0
|
||||||
image_picker: ^1.2.0
|
image_picker: ^1.2.0
|
||||||
flutter_typeahead: ^5.2.0
|
flutter_typeahead: ^5.2.0
|
||||||
go_router: ^16.1.0
|
go_router: ^17.0.0
|
||||||
keyboard_dismisser: ^3.0.0
|
keyboard_dismisser: ^3.0.0
|
||||||
retrofit: ^4.7.1
|
retrofit: ^4.7.1
|
||||||
get_it: ^8.2.0
|
get_it: ^9.0.5
|
||||||
dio: ^5.9.0
|
dio: ^5.9.0
|
||||||
dart_pusher_channels: ^1.2.3
|
dart_pusher_channels: ^1.2.3
|
||||||
photo_view: ^0.15.0
|
photo_view: ^0.15.0
|
||||||
@@ -37,11 +37,11 @@ dependencies:
|
|||||||
easy_debounce: ^2.0.3
|
easy_debounce: ^2.0.3
|
||||||
badges: ^3.1.2
|
badges: ^3.1.2
|
||||||
google_fonts: ^6.3.0
|
google_fonts: ^6.3.0
|
||||||
syncfusion_flutter_charts: ^30.2.5
|
syncfusion_flutter_charts: ^31.2.10
|
||||||
syncfusion_flutter_gauges: ^30.2.5
|
syncfusion_flutter_gauges: ^31.2.10
|
||||||
table_calendar: ^3.2.0
|
table_calendar: ^3.2.0
|
||||||
flutter_keyboard_visibility: ^6.0.0
|
flutter_keyboard_visibility: ^6.0.0
|
||||||
share_plus: ^11.1.0
|
share_plus: ^12.0.1
|
||||||
flutter_html: ^3.0.0
|
flutter_html: ^3.0.0
|
||||||
file_picker: ^10.3.1
|
file_picker: ^10.3.1
|
||||||
audioplayers: ^6.5.0
|
audioplayers: ^6.5.0
|
||||||
@@ -49,7 +49,7 @@ dependencies:
|
|||||||
mask_text_input_formatter: ^2.9.0
|
mask_text_input_formatter: ^2.9.0
|
||||||
lottie: ^3.3.1
|
lottie: ^3.3.1
|
||||||
flutter_portal: ^1.1.4
|
flutter_portal: ^1.1.4
|
||||||
fluttertoast: ^8.2.12
|
fluttertoast: ^9.0.0
|
||||||
flutter_rating_bar: ^4.0.1
|
flutter_rating_bar: ^4.0.1
|
||||||
flutter_image_compress: ^2.4.0
|
flutter_image_compress: ^2.4.0
|
||||||
image: ^4.5.4
|
image: ^4.5.4
|
||||||
@@ -57,8 +57,8 @@ dependencies:
|
|||||||
http: ^1.5.0
|
http: ^1.5.0
|
||||||
flutter_native_splash: ^2.4.6
|
flutter_native_splash: ^2.4.6
|
||||||
webview_flutter: ^4.13.0
|
webview_flutter: ^4.13.0
|
||||||
sentry_flutter: ^9.6.0
|
sentry_flutter: ^9.8.0
|
||||||
connectivity_plus: ^6.1.5
|
connectivity_plus: ^7.0.0
|
||||||
visibility_detector: ^0.4.0+2
|
visibility_detector: ^0.4.0+2
|
||||||
firebase_core: ^4.0.0
|
firebase_core: ^4.0.0
|
||||||
firebase_messaging: ^16.0.0
|
firebase_messaging: ^16.0.0
|
||||||
@@ -67,17 +67,18 @@ dependencies:
|
|||||||
collection: ^1.19.1
|
collection: ^1.19.1
|
||||||
shared_preferences: ^2.5.3
|
shared_preferences: ^2.5.3
|
||||||
version: ^3.0.2
|
version: ^3.0.2
|
||||||
package_info_plus: ^8.3.1
|
package_info_plus: ^9.0.0
|
||||||
device_info_plus: ^11.5.0
|
device_info_plus: ^12.2.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.2.1
|
flutter_dotenv: ^6.0.0
|
||||||
uuid: ^4.5.1
|
uuid: ^4.5.2
|
||||||
appmetrica_plugin: ^3.3.0
|
appmetrica_plugin: ^3.3.0
|
||||||
vk_id: ^1.0.3
|
vk_id: ^1.0.3
|
||||||
flutter_login_yandex: ^0.0.5
|
flutter_login_yandex: ^0.0.5
|
||||||
markdown: ^7.3.0
|
markdown: ^7.3.0
|
||||||
flutter_password_generator: ^1.0.3
|
gpassword: ^1.0.0
|
||||||
|
mobile_scanner: ^7.1.3
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
build_runner: ^2.7.0
|
build_runner: ^2.7.0
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ void main() {
|
|||||||
setUp(() async {
|
setUp(() async {
|
||||||
await sl.reset();
|
await sl.reset();
|
||||||
// Ensure dotenv has required keys before AppConfig constructor reads them
|
// Ensure dotenv has required keys before AppConfig constructor reads them
|
||||||
dotenv.testLoad(fileInput: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
|
dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
|
||||||
// Register minimal AppConfig for tests to satisfy dependencies (e.g. image URL building)
|
// Register minimal AppConfig for tests to satisfy dependencies (e.g. image URL building)
|
||||||
sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
|
sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
|
||||||
mockCreateDietRepository = MockCreateDietRepository();
|
mockCreateDietRepository = MockCreateDietRepository();
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ void main() {
|
|||||||
|
|
||||||
setUp(() async {
|
setUp(() async {
|
||||||
await sl.reset();
|
await sl.reset();
|
||||||
dotenv.testLoad(fileInput: 'DEV_BASE_URL=\nBASE_URL=\n');
|
dotenv.loadFromString(envString: 'DEV_BASE_URL=\nBASE_URL=\n');
|
||||||
mockRecipeRepository = MockRecipeRepository();
|
mockRecipeRepository = MockRecipeRepository();
|
||||||
mockGlossaryRepository = MockGlossaryRepository();
|
mockGlossaryRepository = MockGlossaryRepository();
|
||||||
createRecipeCubit = CreateRecipeCubit(recipeRepository: mockRecipeRepository, glossaryRepository: mockGlossaryRepository);
|
createRecipeCubit = CreateRecipeCubit(recipeRepository: mockRecipeRepository, glossaryRepository: mockGlossaryRepository);
|
||||||
|
|||||||
@@ -220,7 +220,7 @@ void main() {
|
|||||||
|
|
||||||
testWidgets('should display FinishDayButtonWidget', (WidgetTester tester) async {
|
testWidgets('should display FinishDayButtonWidget', (WidgetTester tester) async {
|
||||||
// Arrange
|
// Arrange
|
||||||
final widget = FinishDayButtonWidget(diaryDay: testDiaryEntity);
|
final widget = FinishDayButtonWidget(onPressed: () async {});
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
await tester.pumpWidget(createTestWidget(widget));
|
await tester.pumpWidget(createTestWidget(widget));
|
||||||
@@ -234,7 +234,7 @@ void main() {
|
|||||||
// Arrange
|
// Arrange
|
||||||
diaryCubit.emit(DiaryState.loaded(diary: testDiaryEntity, nutrition: testNutrition, selectedDay: DateTime(2024, 1, 15), selectedMeal: 1));
|
diaryCubit.emit(DiaryState.loaded(diary: testDiaryEntity, nutrition: testNutrition, selectedDay: DateTime(2024, 1, 15), selectedMeal: 1));
|
||||||
|
|
||||||
final widget = FinishDayButtonWidget(diaryDay: testDiaryEntity);
|
final widget = FinishDayButtonWidget(onPressed: () async {});
|
||||||
|
|
||||||
await tester.pumpWidget(createTestWidget(widget));
|
await tester.pumpWidget(createTestWidget(widget));
|
||||||
await tester.pumpAndSettle();
|
await tester.pumpAndSettle();
|
||||||
|
|||||||
Reference in New Issue
Block a user