From 0527ef932cc45a0b5a5975a691abc9f96766df56 Mon Sep 17 00:00:00 2001 From: "Serik.Uvaissov" Date: Wed, 8 Jul 2020 12:42:12 +0600 Subject: [PATCH] linter small fixes --- lib/core/entity/Category.dart | 2 - lib/core/entity/Goods.dart | 2 - lib/core/services/ApiService.dart | 2 +- lib/core/services/DataService.dart | 3 +- lib/redux/actions/kassa_actions.dart | 8 ---- lib/redux/actions/setting_actions.dart | 13 ------- lib/redux/actions/user_actions.dart | 4 +- lib/redux/reducers/setting_reducer.dart | 2 - lib/redux/state/calc_state.dart | 3 -- lib/redux/state/kassa_state.dart | 1 - lib/views/check/image_show_container.dart | 22 ----------- lib/views/home/tabs/AdditionalTab.dart | 3 +- lib/views/home/tabs/CalculatorTab.dart | 2 +- lib/views/home/tabs/KassaTab.dart | 3 +- .../tabs/kassaView/CatalogBottomSheet.dart | 1 - lib/views/info_kkm/info_kkm_view.dart | 6 --- lib/views/payment/payment_view.dart | 1 - lib/views/qr_view/qr_view.dart | 1 - .../components/calculator/calculator.dart | 4 +- .../components/calculator/number-display.dart | 38 +------------------ lib/widgets/fields/aman_icon_button.dart | 2 - lib/widgets/fields/busy_button.dart | 1 - lib/widgets/loader/Dialogs.dart | 1 - 23 files changed, 10 insertions(+), 115 deletions(-) diff --git a/lib/core/entity/Category.dart b/lib/core/entity/Category.dart index 8d78a1b..f816f3a 100644 --- a/lib/core/entity/Category.dart +++ b/lib/core/entity/Category.dart @@ -1,5 +1,3 @@ -import 'package:sqflite/sqflite.dart'; - const String Category_tableName = 'goods_category'; const String Category_columnId = 'id'; const String Category_columnParentIn = 'parent_id'; diff --git a/lib/core/entity/Goods.dart b/lib/core/entity/Goods.dart index a5221c7..6d0f31d 100644 --- a/lib/core/entity/Goods.dart +++ b/lib/core/entity/Goods.dart @@ -1,5 +1,3 @@ -import 'package:sqflite/sqflite.dart'; - const String Goog_tableName = 'goods'; const String Goog_columnId = 'id'; const String Goog_columnArticul = 'articul'; diff --git a/lib/core/services/ApiService.dart b/lib/core/services/ApiService.dart index 4cde25d..0f4f5b4 100644 --- a/lib/core/services/ApiService.dart +++ b/lib/core/services/ApiService.dart @@ -39,7 +39,7 @@ class ApiService extends BaseService { return aman.body; } - Future authenticate_token(String token, { bool statusCheck = true}) async { + Future authenticateToken(String token, { bool statusCheck = true}) async { Map requestBody = { 'token': token }; diff --git a/lib/core/services/DataService.dart b/lib/core/services/DataService.dart index 524c7a7..9c36005 100644 --- a/lib/core/services/DataService.dart +++ b/lib/core/services/DataService.dart @@ -102,7 +102,7 @@ class DataService extends BaseService { * name, * type */ - Future> insertVoucher({ @required User user, String data, String base64Data, @required String name, double total = 0.0, String type = VoucherTypePayment, String url }) { + Future insertVoucher({ @required User user, String data, String base64Data, @required String name, double total = 0.0, String type = VoucherTypePayment, String url }) { assert(user != null); assert(name != null); Voucher voucher = Voucher() @@ -118,6 +118,7 @@ class DataService extends BaseService { log.i( 'save to db appCompanyId: ${user.appCompanyId}, kassaId: ${user.kassaId}'); _db.insert(Voucher_tableName, voucher.toMap()); + return null; } Future> sellOrReturn( diff --git a/lib/redux/actions/kassa_actions.dart b/lib/redux/actions/kassa_actions.dart index c905862..0d797fc 100644 --- a/lib/redux/actions/kassa_actions.dart +++ b/lib/redux/actions/kassa_actions.dart @@ -1,16 +1,10 @@ -import 'dart:convert'; - import 'package:aman_kassa_flutter/core/entity/Category.dart'; import 'package:aman_kassa_flutter/core/entity/Goods.dart'; import 'package:aman_kassa_flutter/core/entity/Service.dart'; import 'package:aman_kassa_flutter/core/locator.dart'; import 'package:aman_kassa_flutter/core/models/dict_dao.dart'; import 'package:aman_kassa_flutter/core/models/product_dao.dart'; -import 'package:aman_kassa_flutter/core/models/response.dart'; -import 'package:aman_kassa_flutter/core/models/smena.dart'; -import 'package:aman_kassa_flutter/core/services/ApiService.dart'; import 'package:aman_kassa_flutter/core/services/DataService.dart'; -import 'package:aman_kassa_flutter/core/services/navigator_service.dart'; import 'package:aman_kassa_flutter/redux/constants/setting_const.dart'; import 'package:aman_kassa_flutter/redux/state/kassa_state.dart'; import 'package:meta/meta.dart'; @@ -25,9 +19,7 @@ class SetKassaStateAction { SetKassaStateAction(this.kassaState); } -final ApiService _api = locator(); final DataService _dataService = locator(); -final NavigatorService _navigation = locator(); Future backBottomElement(Store store) async { List prevCategories = store.state.kassaState.prevCategories; diff --git a/lib/redux/actions/setting_actions.dart b/lib/redux/actions/setting_actions.dart index e86d198..da4953b 100644 --- a/lib/redux/actions/setting_actions.dart +++ b/lib/redux/actions/setting_actions.dart @@ -1,17 +1,4 @@ -import 'dart:convert'; - -import 'package:aman_kassa_flutter/core/entity/Category.dart'; -import 'package:aman_kassa_flutter/core/entity/Goods.dart'; -import 'package:aman_kassa_flutter/core/locator.dart'; -import 'package:aman_kassa_flutter/core/models/dict_dao.dart'; -import 'package:aman_kassa_flutter/core/models/product_dao.dart'; -import 'package:aman_kassa_flutter/core/models/response.dart'; -import 'package:aman_kassa_flutter/core/models/smena.dart'; -import 'package:aman_kassa_flutter/core/services/ApiService.dart'; -import 'package:aman_kassa_flutter/core/services/DataService.dart'; -import 'package:aman_kassa_flutter/core/services/navigator_service.dart'; import 'package:aman_kassa_flutter/redux/constants/setting_const.dart'; -import 'package:aman_kassa_flutter/redux/state/kassa_state.dart'; import 'package:aman_kassa_flutter/redux/state/setting_state.dart'; import 'package:meta/meta.dart'; import 'package:redux/redux.dart'; diff --git a/lib/redux/actions/user_actions.dart b/lib/redux/actions/user_actions.dart index e659481..5826974 100644 --- a/lib/redux/actions/user_actions.dart +++ b/lib/redux/actions/user_actions.dart @@ -1,5 +1,3 @@ -import 'dart:convert'; - import 'package:aman_kassa_flutter/core/locator.dart'; import 'package:aman_kassa_flutter/core/models/message.dart'; import 'package:aman_kassa_flutter/core/models/auth_response.dart'; @@ -108,7 +106,7 @@ ThunkAction authenticateToken(String token) { store.dispatch(SetUserStateAction(UserState(isLoading: true))); try { AuthBody result = - await _api.authenticate_token(token, statusCheck: false); + await _api.authenticateToken(token, statusCheck: false); store.dispatch(SetUserStateAction(UserState( isLoading: false, loginFormMessage: LoginFormMessage( diff --git a/lib/redux/reducers/setting_reducer.dart b/lib/redux/reducers/setting_reducer.dart index e5395f0..5e76b10 100644 --- a/lib/redux/reducers/setting_reducer.dart +++ b/lib/redux/reducers/setting_reducer.dart @@ -1,6 +1,4 @@ -import 'package:aman_kassa_flutter/redux/actions/kassa_actions.dart'; import 'package:aman_kassa_flutter/redux/actions/setting_actions.dart'; -import 'package:aman_kassa_flutter/redux/state/kassa_state.dart'; import 'package:aman_kassa_flutter/redux/state/setting_state.dart'; settingReducer(SettingState prevState, SetSettingStateAction action) { diff --git a/lib/redux/state/calc_state.dart b/lib/redux/state/calc_state.dart index c6712b5..dd1f87c 100644 --- a/lib/redux/state/calc_state.dart +++ b/lib/redux/state/calc_state.dart @@ -1,7 +1,4 @@ -import 'dart:collection'; - import 'package:aman_kassa_flutter/core/models/calc_model.dart'; -import 'package:aman_kassa_flutter/redux/constants/setting_const.dart'; import 'package:meta/meta.dart'; @immutable diff --git a/lib/redux/state/kassa_state.dart b/lib/redux/state/kassa_state.dart index d68a967..e8d6bd0 100644 --- a/lib/redux/state/kassa_state.dart +++ b/lib/redux/state/kassa_state.dart @@ -1,6 +1,5 @@ import 'package:aman_kassa_flutter/core/models/dict_dao.dart'; import 'package:aman_kassa_flutter/core/models/product_dao.dart'; -import 'package:aman_kassa_flutter/core/models/smena.dart'; import 'package:meta/meta.dart'; @immutable diff --git a/lib/views/check/image_show_container.dart b/lib/views/check/image_show_container.dart index 3a2958a..59926a6 100644 --- a/lib/views/check/image_show_container.dart +++ b/lib/views/check/image_show_container.dart @@ -59,23 +59,6 @@ class _MyFloatingActionButtonState extends State { bool showFab = true; DialogService _dialog = locator(); NavigatorService _navigatorService = locator(); -// String _batteryLevel = 'Unknown battery level.'; -// static const platform = const MethodChannel('samples.flutter.dev/battery'); -// -// Future _getBatteryLevel() async { -// String batteryLevel; -// try { -// final int result = await platform.invokeMethod('sendMessage'); -// print(result); -// batteryLevel = 'Battery level at $result % .'; -// } on PlatformException catch (e) { -// batteryLevel = "Failed to get battery level: '${e.message}'."; -// } -// -// setState(() { -// _batteryLevel = batteryLevel; -// }); -// } @override Widget build(BuildContext context) { @@ -96,7 +79,6 @@ class _MyFloatingActionButtonState extends State { color: Colors.grey[300], spreadRadius: 5) ]), - //color: Colors.grey[900], height: 260, child: Column( children: [ @@ -150,9 +132,7 @@ class _MyFloatingActionButtonState extends State { if (response.confirmed) { String phoneNumber = response.responseText; String msg = "Спасибо за покупку! \r\n ${widget.data.url} "; - launchWhatsApp(phone: phoneNumber, message: msg); - //FlutterOpenWhatsapp.sendSingleMessage(phoneNumber, "Спасибо что выбераете нас \r\n https://picsum.photos/200/300 "); } } @@ -161,7 +141,6 @@ class _MyFloatingActionButtonState extends State { @required String message, }) async { String url() { - //return "whatsapp://send?phone=$phone&text=$message"; if (Platform.isIOS) { return "whatsapp://wa.me/$phone/?text=${Uri.encodeFull(message)}"; } else { @@ -173,7 +152,6 @@ class _MyFloatingActionButtonState extends State { if (await canLaunch(url())) { await launch(url()); } else { - //throw 'Could not launch ${url()}'; _dialog.showDialog(description: 'Отсутсвует приложение WhatsApp'); } } diff --git a/lib/views/home/tabs/AdditionalTab.dart b/lib/views/home/tabs/AdditionalTab.dart index 4b2b131..06855e5 100644 --- a/lib/views/home/tabs/AdditionalTab.dart +++ b/lib/views/home/tabs/AdditionalTab.dart @@ -111,8 +111,7 @@ class _AdditionalTabState extends State { updateCatalog = true; }); Dialogs.showLoadingDialog(context, _keyLoader); - bool result = - await _dataService.getDataFromServer(Redux.store.state.userState.user); + await _dataService.getDataFromServer(Redux.store.state.userState.user); Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop(); setState(() { updateCatalog = false; diff --git a/lib/views/home/tabs/CalculatorTab.dart b/lib/views/home/tabs/CalculatorTab.dart index cc1166b..2deb234 100644 --- a/lib/views/home/tabs/CalculatorTab.dart +++ b/lib/views/home/tabs/CalculatorTab.dart @@ -16,7 +16,7 @@ import 'package:aman_kassa_flutter/widgets/components/calculator/number-display. import 'package:flutter_redux/flutter_redux.dart'; class CalculatorTab extends StatelessWidget { - NavigatorService _navigatorService = locator(); + final NavigatorService _navigatorService = locator(); final int index; diff --git a/lib/views/home/tabs/KassaTab.dart b/lib/views/home/tabs/KassaTab.dart index 62cd58a..ec7fced 100644 --- a/lib/views/home/tabs/KassaTab.dart +++ b/lib/views/home/tabs/KassaTab.dart @@ -3,7 +3,6 @@ import 'package:aman_kassa_flutter/core/locator.dart'; import 'package:aman_kassa_flutter/core/models/product_dao.dart'; import 'package:aman_kassa_flutter/core/route_names.dart'; import 'package:aman_kassa_flutter/core/services/navigator_service.dart'; -import 'package:aman_kassa_flutter/redux/actions/kassa_actions.dart'; import 'package:aman_kassa_flutter/redux/constants/operation_const.dart'; import 'package:aman_kassa_flutter/redux/constants/setting_const.dart'; import 'package:aman_kassa_flutter/redux/state/kassa_state.dart'; @@ -19,7 +18,7 @@ import 'package:flutter_redux/flutter_redux.dart'; class KassaTab extends StatelessWidget { - NavigatorService _navigatorService = locator(); + final NavigatorService _navigatorService = locator(); final int index; diff --git a/lib/views/home/tabs/kassaView/CatalogBottomSheet.dart b/lib/views/home/tabs/kassaView/CatalogBottomSheet.dart index 3951419..f7929a0 100644 --- a/lib/views/home/tabs/kassaView/CatalogBottomSheet.dart +++ b/lib/views/home/tabs/kassaView/CatalogBottomSheet.dart @@ -2,7 +2,6 @@ import 'package:aman_kassa_flutter/core/entity/Category.dart'; import 'package:aman_kassa_flutter/core/entity/Goods.dart'; import 'package:aman_kassa_flutter/core/entity/Service.dart'; import 'package:aman_kassa_flutter/core/locator.dart'; -import 'package:aman_kassa_flutter/core/models/Choice.dart'; import 'package:aman_kassa_flutter/core/services/dialog_service.dart'; import 'package:aman_kassa_flutter/redux/actions/kassa_actions.dart'; import 'package:aman_kassa_flutter/redux/actions/setting_actions.dart'; diff --git a/lib/views/info_kkm/info_kkm_view.dart b/lib/views/info_kkm/info_kkm_view.dart index b42aa31..f0cae7a 100644 --- a/lib/views/info_kkm/info_kkm_view.dart +++ b/lib/views/info_kkm/info_kkm_view.dart @@ -1,16 +1,10 @@ -import 'package:aman_kassa_flutter/core/entity/Voucher.dart'; import 'package:aman_kassa_flutter/core/locator.dart'; import 'package:aman_kassa_flutter/core/models/response.dart'; import 'package:aman_kassa_flutter/core/models/user.dart'; -import 'package:aman_kassa_flutter/core/route_names.dart'; import 'package:aman_kassa_flutter/core/services/ApiService.dart'; -import 'package:aman_kassa_flutter/core/services/navigator_service.dart'; import 'package:aman_kassa_flutter/redux/store.dart'; -import 'package:aman_kassa_flutter/shared/app_colors.dart'; -import 'package:aman_kassa_flutter/views/check/image_show_container.dart'; import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class InfoKkmView extends StatefulWidget { InfoKkmView(); diff --git a/lib/views/payment/payment_view.dart b/lib/views/payment/payment_view.dart index cc2cb79..b5199d7 100644 --- a/lib/views/payment/payment_view.dart +++ b/lib/views/payment/payment_view.dart @@ -3,7 +3,6 @@ import 'package:aman_kassa_flutter/core/models/calc_model.dart'; import 'package:aman_kassa_flutter/core/models/product_dao.dart'; import 'package:aman_kassa_flutter/core/models/response.dart'; import 'package:aman_kassa_flutter/core/route_names.dart'; -import 'package:aman_kassa_flutter/core/services/ApiService.dart'; import 'package:aman_kassa_flutter/core/services/DataService.dart'; import 'package:aman_kassa_flutter/core/services/dialog_service.dart'; import 'package:aman_kassa_flutter/core/services/navigator_service.dart'; diff --git a/lib/views/qr_view/qr_view.dart b/lib/views/qr_view/qr_view.dart index 58d15b7..de6157e 100644 --- a/lib/views/qr_view/qr_view.dart +++ b/lib/views/qr_view/qr_view.dart @@ -1,4 +1,3 @@ -import 'package:aman_kassa_flutter/shared/app_colors.dart'; import 'package:aman_kassa_flutter/views/check/image_show_container.dart'; import 'package:flutter/material.dart'; import 'package:qr_flutter/qr_flutter.dart'; diff --git a/lib/widgets/components/calculator/calculator.dart b/lib/widgets/components/calculator/calculator.dart index 51741c2..da15f8c 100644 --- a/lib/widgets/components/calculator/calculator.dart +++ b/lib/widgets/components/calculator/calculator.dart @@ -1,7 +1,5 @@ import 'package:aman_kassa_flutter/core/models/calc_model.dart'; -import 'number-formatter.dart'; - class Calculations { static const PERIOD = '.'; static const MULTIPLY = '*'; @@ -286,7 +284,7 @@ class Calculator { static List _setBackward({String value, List items}) { if (items.isNotEmpty) { - CalcModel last = items.removeLast(); + items.removeLast(); } return [...items]; } diff --git a/lib/widgets/components/calculator/number-display.dart b/lib/widgets/components/calculator/number-display.dart index a1f7fca..09650e6 100644 --- a/lib/widgets/components/calculator/number-display.dart +++ b/lib/widgets/components/calculator/number-display.dart @@ -1,57 +1,23 @@ -import 'dart:math'; - import 'package:flutter/material.dart'; import 'package:auto_size_text/auto_size_text.dart'; class NumberDisplay extends StatelessWidget { - NumberDisplay({this.value: ''}); + NumberDisplay({this.value}); final String value; - GlobalKey stickyKey = GlobalKey(); - @override Widget build(BuildContext context) { return Expanded( child: Padding( padding: const EdgeInsets.only(left: 20.0, right: 20.0, top: 20.0), child: Container( - key: stickyKey, alignment: Alignment.topLeft, child: AutoSizeText( value, style: TextStyle(fontSize: 40), - ), - // child: AnimatedDefaultTextStyle( - // duration: const Duration(milliseconds: 200), - // style: TextStyle( - // fontSize: fontSizeCalc(value: value), - // fontWeight: FontWeight.bold, - // color: Colors.black, - // ), - // child: Text( - // value, - // ), - // ), + ), )), ); } - - double fontSizeCalc({String value = " ", context}) { - const double result = 40.0; - try { - double width = MediaQuery.of(context).size.width; - double height = MediaQuery.of(context).size.height; - double global = width * height / 2; - double scale = (global / value.length); - final pixelOfLetter = sqrt(scale); - final pixelOfLetterP = pixelOfLetter - (pixelOfLetter * 7) / 100; - if (pixelOfLetterP > result) { - return result; - } - return pixelOfLetterP; - } catch (e) { - return result; - } - } } diff --git a/lib/widgets/fields/aman_icon_button.dart b/lib/widgets/fields/aman_icon_button.dart index 26acb4e..0099a36 100644 --- a/lib/widgets/fields/aman_icon_button.dart +++ b/lib/widgets/fields/aman_icon_button.dart @@ -1,5 +1,3 @@ -import 'package:aman_kassa_flutter/shared/app_colors.dart'; -import 'package:aman_kassa_flutter/shared/shared_styles.dart'; import 'package:flutter/material.dart'; /// A button that shows a busy indicator in place of title diff --git a/lib/widgets/fields/busy_button.dart b/lib/widgets/fields/busy_button.dart index e1371a9..06a67bb 100644 --- a/lib/widgets/fields/busy_button.dart +++ b/lib/widgets/fields/busy_button.dart @@ -1,6 +1,5 @@ import 'package:aman_kassa_flutter/shared/app_colors.dart'; import 'package:aman_kassa_flutter/shared/shared_styles.dart'; -import 'package:aman_kassa_flutter/shared/ui_helpers.dart'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/loader/Dialogs.dart b/lib/widgets/loader/Dialogs.dart index 8f69024..97b7c28 100644 --- a/lib/widgets/loader/Dialogs.dart +++ b/lib/widgets/loader/Dialogs.dart @@ -1,4 +1,3 @@ -import 'package:aman_kassa_flutter/shared/app_colors.dart'; import 'package:flutter/material.dart'; class Dialogs {