diff --git a/android/app/build.gradle b/android/app/build.gradle index 8fc22d6d..79e6d71d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -19,15 +19,15 @@ def yandexClientId = project.hasProperty('YANDEX_CLIENT_ID') ? project.property( android { namespace = "com.eatvioapp.app" compileSdk = flutter.compileSdkVersion - ndkVersion = "27.0.12077973" + ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } defaultConfig { diff --git a/lib/features/consultations/presentation/widgets/consultation_card_widget.dart b/lib/features/consultations/presentation/widgets/consultation_card_widget.dart index f9fa4143..b1529280 100644 --- a/lib/features/consultations/presentation/widgets/consultation_card_widget.dart +++ b/lib/features/consultations/presentation/widgets/consultation_card_widget.dart @@ -63,25 +63,28 @@ class _ConsultationCardWidgetState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Row( - children: [ - CircleAvatar(radius: 30, backgroundImage: NetworkImage(widget.consultationsModel.userProfilePhotoUrl)), - const SizedBox(width: 12), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - widget.consultationsModel.userName, - style: const TextStyle(height: 1, color: Color(0xFF323F4B), fontSize: 16, fontWeight: FontWeight.w600), - ), - const SizedBox(height: 4), - Text( - widget.consultationsModel.planTitle, - style: const TextStyle(height: 1, color: Color(0xFF88949F), fontSize: 14, fontWeight: FontWeight.w500), - ), - ], - ), - ], + GestureDetector( + onTap: () => GoRouter.of(context).pushNamed('profileScreen', extra: widget.consultationsModel.userSlug), + child: Row( + children: [ + CircleAvatar(radius: 30, backgroundImage: NetworkImage(widget.consultationsModel.userProfilePhotoUrl)), + const SizedBox(width: 12), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + widget.consultationsModel.userName, + style: const TextStyle(height: 1, color: Color(0xFF323F4B), fontSize: 16, fontWeight: FontWeight.w600), + ), + const SizedBox(height: 4), + Text( + widget.consultationsModel.planTitle, + style: const TextStyle(height: 1, color: Color(0xFF88949F), fontSize: 14, fontWeight: FontWeight.w500), + ), + ], + ), + ], + ), ), const SizedBox(height: 12), GestureDetector( diff --git a/lib/main.dart b/lib/main.dart index b6171864..af6db638 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -9,7 +9,7 @@ import 'package:flutter_portal/flutter_portal.dart'; import 'package:keyboard_dismisser/keyboard_dismisser.dart'; Future main() async { - await AppInitializer.initialize(buildType: AppBuildType.dev); + await AppInitializer.initialize(buildType: AppBuildType.prod); await AppInitializer.runAppWithSentry(() => runApp(const MyApp())); } diff --git a/pubspec.yaml b/pubspec.yaml index 8d81057a..96d5b2b2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -25,10 +25,10 @@ dependencies: flutter_form_builder: ^10.2.0 image_picker: ^1.2.0 flutter_typeahead: ^5.2.0 - go_router: ^16.1.0 + go_router: ^17.0.0 keyboard_dismisser: ^3.0.0 retrofit: ^4.7.1 - get_it: ^8.2.0 + get_it: ^9.0.5 dio: ^5.9.0 dart_pusher_channels: ^1.2.3 photo_view: ^0.15.0 @@ -37,11 +37,11 @@ dependencies: easy_debounce: ^2.0.3 badges: ^3.1.2 google_fonts: ^6.3.0 - syncfusion_flutter_charts: ^30.2.5 - syncfusion_flutter_gauges: ^30.2.5 + syncfusion_flutter_charts: ^31.2.10 + syncfusion_flutter_gauges: ^31.2.10 table_calendar: ^3.2.0 flutter_keyboard_visibility: ^6.0.0 - share_plus: ^11.1.0 + share_plus: ^12.0.1 flutter_html: ^3.0.0 file_picker: ^10.3.1 audioplayers: ^6.5.0 @@ -49,7 +49,7 @@ dependencies: mask_text_input_formatter: ^2.9.0 lottie: ^3.3.1 flutter_portal: ^1.1.4 - fluttertoast: ^8.2.12 + fluttertoast: ^9.0.0 flutter_rating_bar: ^4.0.1 flutter_image_compress: ^2.4.0 image: ^4.5.4 @@ -57,8 +57,8 @@ dependencies: http: ^1.5.0 flutter_native_splash: ^2.4.6 webview_flutter: ^4.13.0 - sentry_flutter: ^9.6.0 - connectivity_plus: ^6.1.5 + sentry_flutter: ^9.8.0 + connectivity_plus: ^7.0.0 visibility_detector: ^0.4.0+2 firebase_core: ^4.0.0 firebase_messaging: ^16.0.0 @@ -67,17 +67,18 @@ dependencies: collection: ^1.19.1 shared_preferences: ^2.5.3 version: ^3.0.2 - package_info_plus: ^8.3.1 - device_info_plus: ^11.5.0 + package_info_plus: ^9.0.0 + device_info_plus: ^12.2.0 permission_handler: ^12.0.1 qr_code_scanner_plus: ^2.0.10+1 - flutter_dotenv: ^5.2.1 - uuid: ^4.5.1 + flutter_dotenv: ^6.0.0 + uuid: ^4.5.2 appmetrica_plugin: ^3.3.0 vk_id: ^1.0.3 flutter_login_yandex: ^0.0.5 markdown: ^7.3.0 flutter_password_generator: ^1.0.3 + mobile_scanner: ^7.1.3 dev_dependencies: build_runner: ^2.7.0 diff --git a/test/features/create_diet/integration_widget_test.dart b/test/features/create_diet/integration_widget_test.dart index 76f7de0b..0d8c7b31 100644 --- a/test/features/create_diet/integration_widget_test.dart +++ b/test/features/create_diet/integration_widget_test.dart @@ -35,7 +35,7 @@ void main() { setUp(() async { await sl.reset(); // 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) sl.registerLazySingleton(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost')); mockCreateDietRepository = MockCreateDietRepository(); diff --git a/test/features/create_recipe/widget_test.dart b/test/features/create_recipe/widget_test.dart index 1b85ac35..6a60b0b3 100644 --- a/test/features/create_recipe/widget_test.dart +++ b/test/features/create_recipe/widget_test.dart @@ -35,7 +35,7 @@ void main() { setUp(() async { await sl.reset(); - dotenv.testLoad(fileInput: 'DEV_BASE_URL=\nBASE_URL=\n'); + dotenv.loadFromString(envString: 'DEV_BASE_URL=\nBASE_URL=\n'); mockRecipeRepository = MockRecipeRepository(); mockGlossaryRepository = MockGlossaryRepository(); createRecipeCubit = CreateRecipeCubit(recipeRepository: mockRecipeRepository, glossaryRepository: mockGlossaryRepository);