linter small fixes

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';

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';

lib/core/services/ApiService.dart

@@ -39,7 +39,7 @@ class ApiService extends BaseService {
     return aman.body;
   }
 
-  Future<AuthBody> authenticate_token(String token, { bool statusCheck = true}) async {
+  Future<AuthBody> authenticateToken(String token, { bool statusCheck = true}) async {
     Map<String, String> requestBody = <String, String>{
       'token': token
     };

lib/core/services/DataService.dart

@@ -102,7 +102,7 @@ class DataService extends BaseService {
          *  name,
          *  type
          */
-  Future<Response<dynamic>> insertVoucher({ @required User user, String data, String base64Data, @required String name,  double total = 0.0, String type = VoucherTypePayment, String url }) {
+  Future<void> 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<Response<dynamic>> sellOrReturn(

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<ApiService>();
 final DataService _dataService = locator<DataService>();
-final NavigatorService _navigation = locator<NavigatorService>();
 
 Future<void> backBottomElement(Store<AppState> store) async {
   List<DictDao> prevCategories = store.state.kassaState.prevCategories;

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';

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<AppState> 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(

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) {

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

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

lib/views/check/image_show_container.dart

@@ -59,23 +59,6 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
   bool showFab = true;
   DialogService _dialog = locator<DialogService>();
   NavigatorService _navigatorService = locator<NavigatorService>();
-//  String _batteryLevel = 'Unknown battery level.';
-//  static const platform = const MethodChannel('samples.flutter.dev/battery');
-//
-//  Future<void> _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<MyFloatingActionButton> {
                                 color: Colors.grey[300],
                                 spreadRadius: 5)
                           ]),
-                      //color: Colors.grey[900],
                       height: 260,
                       child: Column(
                         children: <Widget>[                          
@@ -150,9 +132,7 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
     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<MyFloatingActionButton> {
     @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<MyFloatingActionButton> {
     if (await canLaunch(url())) {
       await launch(url());
     } else {
-      //throw 'Could not launch ${url()}';
       _dialog.showDialog(description: 'Отсутсвует приложение WhatsApp');
     }
   }

lib/views/home/tabs/AdditionalTab.dart

@@ -111,8 +111,7 @@ class _AdditionalTabState extends State<AdditionalTab> {
       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;

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<NavigatorService>();
+  final NavigatorService _navigatorService = locator<NavigatorService>();
 
   final int index;
 

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<NavigatorService>();
+  final NavigatorService _navigatorService = locator<NavigatorService>();
 
   final int index;
 

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';

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();

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';

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';

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<CalcModel> _setBackward({String value, List<CalcModel> items}) {
     if (items.isNotEmpty) {
-      CalcModel last = items.removeLast();
+      items.removeLast();
     }
     return [...items];
   }

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;
-    }
-  }
 }

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

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';
 

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 {