From 56aab17cec961102335aaaef8d205dd9fe3b8b9f Mon Sep 17 00:00:00 2001 From: suvaysov Date: Sat, 2 Jul 2022 19:28:01 +0600 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D1=87?= =?UTF-8?q?=D0=BD=D0=B8=D0=BA=D0=B8=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=B8=20+=20=D1=82=D0=BE=D0=B2=D0=B0=D1=80=D1=8B?= =?UTF-8?q?=20+=20=D0=BA=D0=B0=D0=BE=D0=BD=D1=82=D1=80=D0=B0=D0=B3=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/dict_response_entity.dart | 28 +++++++++---------- lib/core/services/api_service.dart | 2 +- lib/core/utils/locator.dart | 2 ++ lib/views/start_up/start_up_view.dart | 3 -- .../tabs/component/product_list_item.dart | 2 -- lib/views/work/tabs/journal_view.dart | 2 -- lib/views/work/tabs/sell_view.dart | 3 -- .../contragent/select_contragent_view.dart | 2 -- lib/views/work/work_view.dart | 2 -- 9 files changed, 16 insertions(+), 30 deletions(-) diff --git a/lib/core/models/dictionary/response/dict_response_entity.dart b/lib/core/models/dictionary/response/dict_response_entity.dart index 7e0a9e8..932b3a3 100644 --- a/lib/core/models/dictionary/response/dict_response_entity.dart +++ b/lib/core/models/dictionary/response/dict_response_entity.dart @@ -5,14 +5,14 @@ part 'dict_response_entity.g.dart'; @JsonSerializable() class DictResponseEntity { - - factory DictResponseEntity.fromJson(Map json) => _$DictResponseEntityFromJson(json); + factory DictResponseEntity.fromJson(Map json) => + _$DictResponseEntityFromJson(json); DictResponseEntity(); - late DictResponseHeaders headers; - late DictResponseOriginal original; - String? exception; + late DictResponseHeaders headers; + late DictResponseOriginal original; + String? exception; Map toJson() => _$DictResponseEntityToJson(this); @@ -24,12 +24,10 @@ class DictResponseEntity { @JsonSerializable() class DictResponseHeaders { - - - DictResponseHeaders(); - factory DictResponseHeaders.fromJson(Map json) => _$DictResponseHeadersFromJson(json); + factory DictResponseHeaders.fromJson(Map json) => + _$DictResponseHeadersFromJson(json); Map toJson() => _$DictResponseHeadersToJson(this); @@ -41,15 +39,15 @@ class DictResponseHeaders { @JsonSerializable() class DictResponseOriginal { - - factory DictResponseOriginal.fromJson(Map json) => _$DictResponseOriginalFromJson(json); + factory DictResponseOriginal.fromJson(Map json) => + _$DictResponseOriginalFromJson(json); DictResponseOriginal(); - int? overall; - int? page; - int? perpage; - List? data; + int? overall; + int? page; + int? perpage; + List? data; Map>? errors; String? message; diff --git a/lib/core/services/api_service.dart b/lib/core/services/api_service.dart index d8ff2b0..f913c3b 100644 --- a/lib/core/services/api_service.dart +++ b/lib/core/services/api_service.dart @@ -21,7 +21,7 @@ class ApiService extends BaseService { String? token; Future _get(String point, - {Map? requestBody, Map? header}) async { + {Map? header}) async { final Map headers = { HttpHeaders.contentTypeHeader: 'application/json', HttpHeaders.cacheControlHeader: 'no-cache' diff --git a/lib/core/utils/locator.dart b/lib/core/utils/locator.dart index 97a7e3c..8076c01 100644 --- a/lib/core/utils/locator.dart +++ b/lib/core/utils/locator.dart @@ -1,3 +1,5 @@ +// ignore_for_file: avoid_classes_with_only_static_members + import 'package:get_it/get_it.dart'; import 'package:logger/logger.dart'; import 'package:satu/core/services/api_service.dart'; diff --git a/lib/views/start_up/start_up_view.dart b/lib/views/start_up/start_up_view.dart index bc88598..3bbf916 100644 --- a/lib/views/start_up/start_up_view.dart +++ b/lib/views/start_up/start_up_view.dart @@ -4,8 +4,6 @@ import 'package:flutter/material.dart'; import 'package:satu/core/redux/actions/user_actions.dart'; import 'package:satu/core/redux/state/user_state.dart'; import 'package:satu/core/redux/store.dart'; -import 'package:satu/core/services/navigator_service.dart'; -import 'package:satu/core/utils/locator.dart'; import 'package:satu/shared/app_colors.dart'; @@ -15,7 +13,6 @@ class StartUpView extends StatefulWidget { } class _StartUpViewState extends State { - final NavigatorService _navigation = locator(); @override void initState() { diff --git a/lib/views/work/tabs/component/product_list_item.dart b/lib/views/work/tabs/component/product_list_item.dart index 402d2b2..c249898 100644 --- a/lib/views/work/tabs/component/product_list_item.dart +++ b/lib/views/work/tabs/component/product_list_item.dart @@ -5,7 +5,6 @@ import 'package:satu/core/models/dialog_models.dart'; import 'package:satu/core/redux/actions/sell_actions.dart'; import 'package:satu/core/redux/store.dart'; import 'package:satu/core/services/dialog_service.dart'; -import 'package:satu/core/services/navigator_service.dart'; import 'package:satu/core/utils/locator.dart'; import 'package:satu/core/utils/utils_parse.dart'; import 'package:satu/shared/app_colors.dart'; @@ -39,7 +38,6 @@ class ProductListItem extends StatefulWidget { } class _ProductListItemState extends State { - final NavigatorService _navigatorService = locator(); final DialogService _dialogService = locator(); void _onItemTapped(BuildContext context) { diff --git a/lib/views/work/tabs/journal_view.dart b/lib/views/work/tabs/journal_view.dart index 226346f..5adfa4f 100644 --- a/lib/views/work/tabs/journal_view.dart +++ b/lib/views/work/tabs/journal_view.dart @@ -5,7 +5,6 @@ import 'package:satu/core/models/flow/dao/transaction_dao.dart'; import 'package:satu/core/redux/actions/journal_actions.dart'; import 'package:satu/core/redux/state/journal_state.dart'; import 'package:satu/core/redux/store.dart'; -import 'package:satu/core/services/data_service.dart'; import 'package:satu/core/services/navigator_service.dart'; import 'package:satu/core/utils/locator.dart'; import 'package:satu/routes/route_names.dart'; @@ -20,7 +19,6 @@ class JournalView extends StatefulWidget { } class _JournalViewState extends State { - final DataService _dataService = locator(); final NavigatorService _navigatorService = locator(); int tabIndex = 0; diff --git a/lib/views/work/tabs/sell_view.dart b/lib/views/work/tabs/sell_view.dart index 9a524b3..ed0ae70 100644 --- a/lib/views/work/tabs/sell_view.dart +++ b/lib/views/work/tabs/sell_view.dart @@ -2,12 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:redux/src/store.dart'; -import 'package:satu/core/entity/goods_entity.dart'; import 'package:satu/core/models/flow/dao/product_dao.dart'; -import 'package:satu/core/redux/actions/sell_actions.dart'; import 'package:satu/core/redux/state/sell_state.dart'; import 'package:satu/core/redux/store.dart'; -import 'package:satu/core/services/dictionary_service.dart'; import 'package:satu/core/services/navigator_service.dart'; import 'package:satu/core/utils/locator.dart'; import 'package:satu/routes/route_names.dart'; diff --git a/lib/views/work/views/contragent/select_contragent_view.dart b/lib/views/work/views/contragent/select_contragent_view.dart index 71fbcd0..8b7c814 100644 --- a/lib/views/work/views/contragent/select_contragent_view.dart +++ b/lib/views/work/views/contragent/select_contragent_view.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:satu/core/entity/category_entity.dart'; import 'package:satu/core/entity/goods_entity.dart'; import 'package:satu/core/services/dictionary_service.dart'; -import 'package:satu/core/services/navigator_service.dart'; import 'package:satu/core/utils/locator.dart'; import 'package:satu/shared/app_colors.dart'; import 'package:satu/shared/ui_helpers.dart'; @@ -19,7 +18,6 @@ class SelectContragentView extends StatefulWidget { class _SelectContragentViewState extends State { final DictionaryService _dictionaryService = locator(); - final NavigatorService _navigatorService = locator(); late TextEditingController _searchTextController; final FocusNode _searchFocusNode = new FocusNode(); diff --git a/lib/views/work/work_view.dart b/lib/views/work/work_view.dart index 6b25e33..5782272 100644 --- a/lib/views/work/work_view.dart +++ b/lib/views/work/work_view.dart @@ -16,8 +16,6 @@ class WorkView extends StatefulWidget { class _WorkViewState extends State { int _selectedIndex = 0; - static const TextStyle optionStyle = - TextStyle(fontSize: 30, fontWeight: FontWeight.bold); final List _widgetOptions = [ SellView(), BuyView(),