From 9ccb1d08c3b118b70e297f8ea4c810a8c0dfe5de Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 10 Jan 2025 11:32:19 +0300 Subject: [PATCH] fix: black screen --- android/app/src/main/AndroidManifest.xml | 25 ++++++++++------ .../drawable-night-v21/launch_background.xml | 6 ++++ .../res/drawable-night/launch_background.xml | 6 ++++ lib/core/const.dart | 3 +- lib/core/token_storage.dart | 12 +++++--- .../auth/auth_screen/auth_screen.dart | 2 +- .../diary/presentation/bloc/diary_cubit.dart | 6 ---- .../presentation/pages/profile_screen.dart | 24 ++++++++------- .../pages/city_of_living_screen.dart | 4 +++ lib/main.dart | 4 +-- pubspec.yaml | 29 +++++++++---------- 11 files changed, 71 insertions(+), 50 deletions(-) create mode 100644 android/app/src/main/res/drawable-night-v21/launch_background.xml create mode 100644 android/app/src/main/res/drawable-night/launch_background.xml diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 516dace6..ed9a67f1 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,21 +1,22 @@ +package="com.eatvioapp.app"> - + android:windowSoftInputMode="adjustResize"> @@ -40,4 +36,15 @@ android:name="flutterEmbedding" android:value="2" /> + + + + + + + diff --git a/android/app/src/main/res/drawable-night-v21/launch_background.xml b/android/app/src/main/res/drawable-night-v21/launch_background.xml new file mode 100644 index 00000000..f88598cf --- /dev/null +++ b/android/app/src/main/res/drawable-night-v21/launch_background.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/android/app/src/main/res/drawable-night/launch_background.xml b/android/app/src/main/res/drawable-night/launch_background.xml new file mode 100644 index 00000000..f88598cf --- /dev/null +++ b/android/app/src/main/res/drawable-night/launch_background.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/lib/core/const.dart b/lib/core/const.dart index 24e72cdd..8eea1db0 100644 --- a/lib/core/const.dart +++ b/lib/core/const.dart @@ -1,4 +1,5 @@ -String baseUrl = 'https://dev2.eatvio.com'; +String baseUrl = 'https://eatvio.ru'; +// String baseUrl = 'https://dev2.eatvio.com'; const List durationValues = [7, 14, 21]; diff --git a/lib/core/token_storage.dart b/lib/core/token_storage.dart index bc795829..4a8bb21d 100644 --- a/lib/core/token_storage.dart +++ b/lib/core/token_storage.dart @@ -8,11 +8,15 @@ abstract class TokenStorage { } static haveTokenInStorage() async { - if (await FlutterSecureStorage().read(key: 'token') == null) { + try { + if (await FlutterSecureStorage().read(key: 'token') == null) { + return false; + } else { + _addTokenToDioHeader((await FlutterSecureStorage().read(key: 'token'))!); + return true; + } + } catch (e) { return false; - } else { - _addTokenToDioHeader((await FlutterSecureStorage().read(key: 'token'))!); - return true; } } diff --git a/lib/features/auth/auth_screen/auth_screen.dart b/lib/features/auth/auth_screen/auth_screen.dart index 78cfdfc1..7e42bbed 100644 --- a/lib/features/auth/auth_screen/auth_screen.dart +++ b/lib/features/auth/auth_screen/auth_screen.dart @@ -11,6 +11,7 @@ import 'package:eatvio_app/generated/l10n.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_native_splash/flutter_native_splash.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:go_router/go_router.dart'; import 'package:http/http.dart' as http; @@ -19,7 +20,6 @@ import 'package:validators/validators.dart'; import 'bloc/auth_bloc.dart'; import 'models/auth_model.dart'; -import 'package:flutter_native_splash/flutter_native_splash.dart'; class AuthScreen extends StatefulWidget { static Widget builder(BuildContext context) { diff --git a/lib/features/diary/presentation/bloc/diary_cubit.dart b/lib/features/diary/presentation/bloc/diary_cubit.dart index 542240e2..b5b00adf 100644 --- a/lib/features/diary/presentation/bloc/diary_cubit.dart +++ b/lib/features/diary/presentation/bloc/diary_cubit.dart @@ -105,12 +105,6 @@ class DiaryCubit extends Cubit { required PortionState portionState, }) async { if (portionState == PortionState.filled_diet || portionState == PortionState.eaten_from_diet) { - // await diaryRepository.deleteProductFromMeal( - // diaryId: diaryId, - // mealId: mealId, - // portionId: portionId, - // ); - // todo delete product from diet await diaryRepository.addPortionToMeal( diaryId: diaryId, mealId: mealId, diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart index b838f707..1baf2cae 100644 --- a/lib/features/profile/presentation/pages/profile_screen.dart +++ b/lib/features/profile/presentation/pages/profile_screen.dart @@ -26,12 +26,12 @@ import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_native_splash/flutter_native_splash.dart'; import 'package:go_router/go_router.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:image_picker/image_picker.dart'; import 'package:share_plus/share_plus.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:flutter_native_splash/flutter_native_splash.dart'; class ProfileScreen extends StatefulWidget { final Author? author; @@ -456,7 +456,9 @@ class _ProfileScreenState extends State { } _education(ProfileStateLoaded state) { - if (state.profile.role != 'consultant' || state.profile.educationResource?.completedCourses == null) { + if (state.profile.role != 'consultant' || + state.profile.educationResource?.completedCourses == null || + state.profile.educationResource?.completedCourses?.length == 0) { return const SizedBox.shrink(); } return Padding( @@ -911,15 +913,15 @@ class _ProfileScreenState extends State { child: Text('Посмотреть'), ), if (widget.author == null) - PopupMenuItem( - value: 'replace', - child: Text('Заменить'), - ), + PopupMenuItem( + value: 'replace', + child: Text('Заменить'), + ), if (widget.author == null) - PopupMenuItem( - value: 'delete', - child: Text('Удалить'), - ), + PopupMenuItem( + value: 'delete', + child: Text('Удалить'), + ), ], child: Hero( tag: state.profile.profilePhotoUrl, @@ -1102,7 +1104,7 @@ class _ProfileScreenState extends State { ); } - _charts() { + _charts() { return Material( color: Colors.white, borderRadius: BorderRadius.circular(16), diff --git a/lib/features/registration/presentation/pages/city_of_living_screen.dart b/lib/features/registration/presentation/pages/city_of_living_screen.dart index 8e049fd0..b8c0fae4 100644 --- a/lib/features/registration/presentation/pages/city_of_living_screen.dart +++ b/lib/features/registration/presentation/pages/city_of_living_screen.dart @@ -101,6 +101,10 @@ class _CityOfLivingScreenState extends State { focusNode: focus, autofocus: true, hintText: 'Москва', + onChanged: (value) { + final registrationCubit = context.read(); + registrationCubit.updateSheet(registrationCubit.state.sheet.copyWith(location: value)); + }, textStyle: TextStyle( fontSize: 16, color: Colors.black, diff --git a/lib/main.dart b/lib/main.dart index 8672683a..e910f18e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -11,11 +11,11 @@ import 'package:eatvio_app/generated/l10n.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:flutter_native_splash/flutter_native_splash.dart'; import 'package:flutter_portal/flutter_portal.dart'; import 'package:keyboard_dismisser/keyboard_dismisser.dart'; -import 'package:flutter_native_splash/flutter_native_splash.dart'; -void main() async { +Future main() async { WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized(); FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding); await di.init(); diff --git a/pubspec.yaml b/pubspec.yaml index 9a4a500b..17fb776c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: eatvio_app description: A new Flutter project. -version: 1.0.8+23 +version: 1.0.10+25 publish_to: "none" environment: @@ -13,22 +13,22 @@ dependencies: flutter_localizations: sdk: flutter - flutter_secure_storage: ^9.2.2 + flutter_secure_storage: ^9.2.3 flutter_bloc: ^8.1.6 cached_network_image: ^3.4.1 - flutter_svg: ^2.0.16 + flutter_svg: ^2.0.17 equatable: ^2.0.7 freezed_annotation: ^2.4.4 json_annotation: ^4.9.0 validators: ^3.0.0 path_provider: ^2.1.5 carousel_slider_plus: ^7.1.0 - flutter_form_builder: ^9.5.0 + flutter_form_builder: ^10.0.0-dev.1 image_picker: ^1.1.2 flutter_typeahead: ^5.2.0 - go_router: ^14.6.2 + go_router: ^14.6.3 keyboard_dismisser: ^3.0.0 - retrofit: ^4.4.1 + retrofit: ^4.4.2 get_it: ^8.0.3 dio: ^5.7.0 dart_pusher_channels: ^1.2.3 @@ -39,29 +39,26 @@ dependencies: badges: ^3.1.2 google_fonts: ^6.2.1 location: ^7.0.1 - syncfusion_flutter_charts: ^28.1.33 - syncfusion_flutter_gauges: ^28.1.33 + syncfusion_flutter_charts: ^28.1.38 + syncfusion_flutter_gauges: ^28.1.38 table_calendar: ^3.1.3 flutter_keyboard_visibility: ^6.0.0 share_plus: ^10.1.3 flutter_html: ^3.0.0-beta.2 - file_picker: - git: - url: https://github.com/abdelaziz-mahdy/flutter_file_picker - ref: fix-flutter-3.27-compile-error + file_picker: ^8.1.7 audioplayers: ^6.1.0 intl: ^0.19.0 rive: ^0.13.20 mask_text_input_formatter: ^2.9.0 - lottie: ^3.1.3 + lottie: ^3.3.0 flutter_portal: ^1.1.4 - fluttertoast: ^8.2.8 + fluttertoast: ^8.2.10 flutter_rating_bar: ^4.0.1 - flutter_image_compress: ^2.3.0 + flutter_image_compress: ^2.4.0 image: ^4.3.0 - flutter_native_splash: ^2.4.3 dotted_border: ^2.1.0 http: ^1.2.2 + flutter_native_splash: ^2.4.4 dev_dependencies: build_runner: ^2.4.14