diff --git a/analysis_options.yaml b/analysis_options.yaml index 9722fb45..22f04010 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,4 +1,6 @@ analyzer: + errors: + invalid_annotation_target: ignore plugins: - dart_code_metrics diff --git a/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart b/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart index ef5d8b8e..a2068225 100644 --- a/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart +++ b/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart @@ -76,52 +76,6 @@ class ChatSelectScreen extends StatelessWidget { } } -_buildScreen(BuildContext context, ChatSelectLoadedState state) { - return Scaffold( - resizeToAvoidBottomInset: false, - body: Container( - width: double.maxFinite, - decoration: AppDecoration.fillGray, - child: ListView( - children: [ - SizedBox(height: 30.v), - Container( - margin: EdgeInsets.only( - left: 16.h, - right: 20.h, - bottom: 10.h, - ), - padding: EdgeInsets.all(12.h), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: const BorderRadius.all(Radius.circular(12)), - boxShadow: [ - BoxShadow( - color: Colors.grey.withOpacity(0.5), - spreadRadius: 2, - blurRadius: 5, - offset: Offset(0, 3), - ), - ], - ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - CustomSearchView( - controller: state.searchController, - hintText: "Поиск", - ), - SizedBox(height: 20.v), - _buildChatList(context, state), - ], - ), - ) - ], - ), - ), - ); -} - _buildChatList(BuildContext context, ChatSelectLoadedState state) { return ListView.separated( padding: EdgeInsets.all(16), diff --git a/lib/features/chat/services/chat_service.dart b/lib/features/chat/services/chat_service.dart index fc213667..5b27ccf2 100644 --- a/lib/features/chat/services/chat_service.dart +++ b/lib/features/chat/services/chat_service.dart @@ -7,7 +7,7 @@ part 'chat_service.g.dart'; @RestApi() abstract class ChatService { - factory ChatService(Dio dio) = _ChatService; + factory ChatService(Dio dio, {String baseUrl}) = _ChatService; @GET('/chat/show/{id}') Future> getChatRoomModel(@Path() String id); diff --git a/pubspec.yaml b/pubspec.yaml index 018e7418..6000794d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,13 +1,17 @@ name: eatvio_app description: A new Flutter project. version: 0.0.0+1 + environment: sdk: '>=3.3.4 <4.0.0' -dependencies: - flutter: + +dependencies: + flutter: sdk: flutter - flutter_localizations: + + flutter_localizations: sdk: flutter + flutter_bloc: ^8.0.0 connectivity_plus: ^5.0.2 shared_preferences: ^2.0.15 @@ -42,20 +46,20 @@ dependencies: #url launcher url_launcher: ^6.3.0 -dev_dependencies: +dev_dependencies: dart_code_metrics: ^5.7.6 dart_code_metrics_presets: ^1.8.0 - build_runner: ^2.4.9 + build_runner: ^2.4.11 freezed: ^2.5.2 json_serializable: ^6.8.0 retrofit_generator: ^8.1.0 - flutter_test: + flutter_test: sdk: flutter -flutter: +flutter: uses-material-design: true - assets: + assets: - assets/ - assets/images/ - .env @@ -71,4 +75,4 @@ flutter: - asset: assets/fonts/MulishRegular.ttf weight: 400 - asset: assets/fonts/MulishSemiBold.ttf - weight: 600 + weight: 600 \ No newline at end of file