From 2b5da83e38671a5da91a510c5e6277d869ff896c Mon Sep 17 00:00:00 2001 From: maxxkim Date: Thu, 2 May 2024 13:56:39 +0300 Subject: [PATCH] refactor(iOS): Refactoring for iOS bundle --- ios/Runner/Info.plist | 7 +++++++ lib/presentation/auth/auth_screen/auth_screen.dart | 8 ++++++-- .../diary_edit_screen/bloc/diary_edit_bloc.dart | 12 ++++++++++++ .../diary_edit_screen/bloc/diary_edit_event.dart | 9 +++++++++ .../diary/diary_edit_screen/diary_edit_screen.dart | 1 - lib/widgets/app_bar/appbar_title_image.dart | 1 - 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 8397f756..fb188418 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -26,6 +26,13 @@ LaunchScreen UIMainStoryboardFile Main + NSPhotoLibraryUsageDescription + UserPhotoUpload + UIBackgroundModes + + fetch + remote-notification + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/lib/presentation/auth/auth_screen/auth_screen.dart b/lib/presentation/auth/auth_screen/auth_screen.dart index b85786d6..3fe6ee47 100644 --- a/lib/presentation/auth/auth_screen/auth_screen.dart +++ b/lib/presentation/auth/auth_screen/auth_screen.dart @@ -30,7 +30,11 @@ class AuthScreen extends StatelessWidget { return Scaffold( resizeToAvoidBottomInset: false, appBar: _buildAppBar(context), - body: Container( + body:GestureDetector( + onTap: () { + FocusScope.of(context).unfocus(); // Скрыть клавиатуру + }, + child: Container( width: double.maxFinite, padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 9.v), child: Column(children: [ @@ -85,7 +89,7 @@ class AuthScreen extends StatelessWidget { buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: onTapAuth(state, context)); }), - ]))); + ])))); } onTapAuth(AuthState state, BuildContext context) { diff --git a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart index 20df3530..44741105 100644 --- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart +++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart @@ -38,6 +38,7 @@ class DiaryEditBloc extends Bloc { on(_sendModeration); on( reloadScreen); //пользователь нажимает "Добавить комментарий" + on(_clearInput); } Future _onInitialize( @@ -547,6 +548,17 @@ class DiaryEditBloc extends Bloc { } } + + FutureOr _clearInput( + ClearInput event, Emitter emit) { + if (state is DiaryEditLoadedState) { + var currentState = state as DiaryEditLoadedState; + DiaryEditLoadedState updatedState = currentState.copyWith( + ); + emit(updatedState); + } + } + FutureOr _changePortion( ChangePortion event, Emitter emit) { if (state is DiaryEditLoadedState) { diff --git a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart index 08b1e90a..8185fa28 100644 --- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart +++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart @@ -122,6 +122,15 @@ class ChangeMeal extends DiaryEditEvent { List get props => [value, meals]; } + +class ClearInput extends DiaryEditEvent { + ClearInput({required this.value}); + + TextEditingController value; + @override + List get props => [value]; +} + class ChangePortion extends DiaryEditEvent { ChangePortion({required this.value}); diff --git a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart index b189b214..1e81c626 100644 --- a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart +++ b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart @@ -376,7 +376,6 @@ class DiaryEditScreen extends StatelessWidget { ) { if (state.isAdded) { print("Clear"); - productEditingController.clear(); } return CustomTextFormField( hintText: "Введите название продукта", diff --git a/lib/widgets/app_bar/appbar_title_image.dart b/lib/widgets/app_bar/appbar_title_image.dart index e15f1c52..4ef20de2 100644 --- a/lib/widgets/app_bar/appbar_title_image.dart +++ b/lib/widgets/app_bar/appbar_title_image.dart @@ -35,6 +35,5 @@ class AppbarTitleImage extends StatelessWidget { } void onTapCall() { - onTap!.call(); } }