pedantic package and other fixed compelted

Veli Bacik · Veli Bacik · commit 240f596b8587 · 2021-01-11T23:56:51.000+03:00
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:pedantic/analysis_options.1.9.0.yaml
diff --git a/lib/core/base/model/base_error.dart b/lib/core/base/model/base_error.dart
@@ -1,4 +1,4 @@
-import 'package:fluttermvvmtemplate/core/init/network/IResponseModel.dart';
+import '../../init/network/IResponseModel.dart';
 
 class BaseError extends IErrorModel {
   final String message;
diff --git a/lib/core/components/button/icon_button.dart b/lib/core/components/button/icon_button.dart
@@ -10,7 +10,7 @@ class IconNormalButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return NormalButton(
-      onPressed: this.onPressed,
+      onPressed: onPressed,
       child: Center(
         child: Icon(icon),
       ),
diff --git a/lib/core/components/button/normal_button.dart b/lib/core/components/button/normal_button.dart
@@ -11,7 +11,7 @@ class NormalButton extends StatelessWidget {
     return RaisedButton(
       padding: EdgeInsets.all(15),
       elevation: 10,
-      onPressed: this.onPressed,
+      onPressed: onPressed,
       child: child,
     );
   }
diff --git a/lib/core/components/button/title_text_button.dart b/lib/core/components/button/title_text_button.dart
@@ -10,7 +10,7 @@ class TitleTextButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return NormalButton(
-      onPressed: this.onPressed,
+      onPressed: onPressed,
       child: Center(
         child: Text(text),
       ),
diff --git a/lib/core/components/card/not_found_navigation_widget.dart b/lib/core/components/card/not_found_navigation_widget.dart
@@ -4,7 +4,7 @@ class NotFoundNavigationWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Text("Not Found"),
+      body: Text('Not Found'),
     );
   }
 }
diff --git a/lib/core/components/column/form_column.dart b/lib/core/components/column/form_column.dart
@@ -12,7 +12,7 @@ class FormColumn extends StatelessWidget {
         Expanded(
           flex: 8,
           child: Column(
-            children: this.children,
+            children: children,
           ),
         ),
         Spacer(flex: 1),
diff --git a/lib/core/components/decoration/circle_decoration.dart b/lib/core/components/decoration/circle_decoration.dart
@@ -13,14 +13,16 @@ class _CirclePainter extends BoxPainter {
   final Paint _paint;
   final double radius;
 
+  Offset circleOffset;
+
   _CirclePainter(Color color, this.radius)
       : _paint = Paint()
           ..color = color
           ..isAntiAlias = true;
 
   @override
   void paint(Canvas canvas, Offset offset, ImageConfiguration cfg) {
-    final Offset circleOffset = offset + Offset(cfg.size.width / 2, cfg.size.height - radius - 5);
+    circleOffset = offset + Offset(cfg.size.width / 2, cfg.size.height - radius - 5);
     canvas.drawCircle(circleOffset, radius, _paint);
   }
 }
diff --git a/lib/core/constants/app/app_constants.dart b/lib/core/constants/app/app_constants.dart
@@ -1,8 +1,8 @@
 class ApplicationConstants {
-  static const LANG_ASSET_PATH = "asset/lang";
-  static const IPAD_NAME = "IPAD";
-  static const FONT_FAMILY = "POPPINS";
-  static const COMPANY_NAME = "HWA";
+  static const LANG_ASSET_PATH = 'asset/lang';
+  static const IPAD_NAME = 'IPAD';
+  static const FONT_FAMILY = 'POPPINS';
+  static const COMPANY_NAME = 'HWA';
 
-  static const EMAIL_REGIEX = r"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}\$";
+  static const EMAIL_REGIEX = r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}\$';
 }
diff --git a/lib/core/constants/image/image_constatns.dart b/lib/core/constants/image/image_constatns.dart
@@ -1,16 +1,13 @@
 class ImageConstants {
   static ImageConstants _instace;
 
-  static ImageConstants get instance {
-    if (_instace == null) _instace = ImageConstants._init();
-    return _instace;
-  }
+  static ImageConstants get instance => _instace ??= ImageConstants._init();
 
   ImageConstants._init();
 
-  String get logo => toPng("veli");
+  String get logo => toPng('veli');
 
-  String get hotDog => toPng("hotdogs");
+  String get hotDog => toPng('hotdogs');
 
-  String toPng(String name) => "asset/image/$name.png";
+  String toPng(String name) => 'asset/image/$name.png';
 }
diff --git a/lib/core/extension/string_extension.dart b/lib/core/extension/string_extension.dart
@@ -5,11 +5,11 @@ import '../constants/app/app_constants.dart';
 extension StringLocalization on String {
   String get locale => this.tr();
 
-  String get isValidEmail => this.contains(RegExp(ApplicationConstants.EMAIL_REGIEX)) ? null : "Email does not valid";
+  String get isValidEmail => contains(RegExp(ApplicationConstants.EMAIL_REGIEX)) ? null : 'Email does not valid';
 
   bool get isValidEmails => RegExp(ApplicationConstants.EMAIL_REGIEX).hasMatch(this);
 }
 
 extension ImagePathExtension on String {
-  String get toSVG => "asset/svg/$this.svg";
+  String get toSVG => 'asset/svg/$this.svg';
 }
diff --git a/lib/core/init/cache/locale_manager.dart b/lib/core/init/cache/locale_manager.dart
@@ -3,7 +3,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import '../../constants/enums/locale_keys_enum.dart';
 
 class LocaleManager {
-  static LocaleManager _instance = LocaleManager._init();
+  static final LocaleManager _instance = LocaleManager._init();
 
   SharedPreferences _preferences;
   static LocaleManager get instance => _instance;
@@ -13,11 +13,8 @@ class LocaleManager {
       _preferences = value;
     });
   }
-  static prefrencesInit() async {
-    if (instance._preferences == null) {
-      instance._preferences = await SharedPreferences.getInstance();
-    }
-    return;
+  static Future prefrencesInit() async {
+    instance._preferences ??= await SharedPreferences.getInstance();
   }
 
   Future<void> clearAll() async {
@@ -32,9 +29,7 @@ class LocaleManager {
     await _preferences.setBool(key.toString(), value);
   }
 
-  String getStringValue(PreferencesKeys key) =>
-      _preferences.getString(key.toString()) ?? "";
+  String getStringValue(PreferencesKeys key) => _preferences.getString(key.toString()) ?? '';
 
-  bool getBoolValue(PreferencesKeys key) =>
-      _preferences.getBool(key.toString()) ?? false;
+  bool getBoolValue(PreferencesKeys key) => _preferences.getBool(key.toString()) ?? false;
 }
diff --git a/lib/core/init/navigation/navigation_service.dart b/lib/core/init/navigation/navigation_service.dart
@@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart';
 import 'INavigationService.dart';
 
 class NavigationService implements INavigationService {
-  static NavigationService _instance = NavigationService._init();
+  static final NavigationService _instance = NavigationService._init();
   static NavigationService get instance => _instance;
 
   NavigationService._init();
diff --git a/lib/core/init/network/ICoreDio.dart b/lib/core/init/network/ICoreDio.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:fluttermvvmtemplate/core/init/network/IResponseModel.dart';
 
 import '../../base/model/base_model.dart';
 import '../../constants/enums/http_request_enum.dart';
+import 'IResponseModel.dart';
 
 abstract class ICoreDio {
   Future<IResponseModel<R>> fetch<R, T extends BaseModel>(String path,
diff --git a/lib/core/init/network/IResponseModel.dart b/lib/core/init/network/IResponseModel.dart
@@ -8,7 +8,9 @@ abstract class IErrorModel<T> {
 }
 
 class ResponseModel<T> extends IResponseModel<T> {
+  @override
   final T data;
+  @override
   final IErrorModel error;
 
   ResponseModel({this.data, this.error});
diff --git a/lib/core/init/network/core_dio.dart b/lib/core/init/network/core_dio.dart
@@ -11,17 +11,19 @@ import '../../extension/network_exntension.dart';
 import 'ICoreDio.dart';
 import 'IResponseModel.dart';
 
-part "./network_core/core_operations.dart";
+part './network_core/core_operations.dart';
 
 class CoreDio with DioMixin implements Dio, ICoreDio {
+  @override
   final BaseOptions options;
 
   CoreDio(this.options) {
-    this.options = options;
-    this.interceptors.add(InterceptorsWrapper());
-    this.httpClientAdapter = DefaultHttpClientAdapter();
+    options = options;
+    interceptors.add(InterceptorsWrapper());
+    httpClientAdapter = DefaultHttpClientAdapter();
   }
 
+  @override
   Future<IResponseModel<R>> fetch<R, T extends BaseModel>(String path,
       {@required HttpTypes type,
       @required T parseModel,
@@ -35,7 +37,7 @@ class CoreDio with DioMixin implements Dio, ICoreDio {
         final model = _responseParser<R, T>(parseModel, response.data);
         return ResponseModel<R>(data: model);
       default:
-        return ResponseModel(error: BaseError("message"));
+        return ResponseModel(error: BaseError('message'));
     }
   }
 }
diff --git a/lib/core/init/network/network_manager.dart b/lib/core/init/network/network_manager.dart
@@ -1,12 +1,8 @@
-import 'dart:io';
-
 import 'package:dio/dio.dart';
-import 'package:fluttermvvmtemplate/core/init/network/ICoreDio.dart';
 
-import '../../base/model/base_error.dart';
-import '../../base/model/base_model.dart';
 import '../../constants/enums/locale_keys_enum.dart';
 import '../cache/locale_manager.dart';
+import 'ICoreDio.dart';
 import 'core_dio.dart';
 
 class NetworkManager {
@@ -19,10 +15,8 @@ class NetworkManager {
   ICoreDio coreDio;
 
   NetworkManager._init() {
-    final baseOptions = BaseOptions(
-      baseUrl: "https://jsonplaceholder.typicode.com/",
-      headers: {"val": LocaleManager.instance.getStringValue(PreferencesKeys.TOKEN)},
-    );
+    final baseOptions =
+        BaseOptions(baseUrl: "https://jsonplaceholder.typicode.com/", headers: {"val": LocaleManager.instance.getStringValue(PreferencesKeys.TOKEN)});
     // _dio = Dio(baseOptions);
 
     coreDio = CoreDio(baseOptions);
diff --git a/lib/core/init/network/vexana_manager.dart b/lib/core/init/network/vexana_manager.dart
@@ -5,12 +5,13 @@ import 'package:vexana/vexana.dart';
 class VexanaManager {
   static VexanaManager _instace;
   static VexanaManager get instance {
-    if (_instace == null) _instace = VexanaManager._init();
+    if (_instace != null) return _instace;
+    _instace = VexanaManager._init();
     return _instace;
   }
 
-  static const String _iosBaseUrl = "http://localhost:3000/";
-  static const String _androidBaseUrl = "http://10.0.2.2:3000/";
+  static const String _iosBaseUrl = 'http://localhost:3000/';
+  static const String _androidBaseUrl = 'http://10.0.2.2:3000/';
 
   VexanaManager._init();
 
diff --git a/lib/core/init/theme/light/light_theme_interface.dart b/lib/core/init/theme/light/light_theme_interface.dart
@@ -1,6 +1,6 @@
-import 'package:fluttermvvmtemplate/core/init/theme/light/color_scheme_light.dart';
-import 'package:fluttermvvmtemplate/core/init/theme/light/padding_insets.dart';
-import 'package:fluttermvvmtemplate/core/init/theme/light/text_theme_light.dart';
+import 'color_scheme_light.dart';
+import 'padding_insets.dart';
+import 'text_theme_light.dart';
 
 abstract class ILightTheme {
   TextThemeLight textThemeLight = TextThemeLight.instance;
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,6 +1,5 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:fluttermvvmtemplate/view/home/build/feed/view/build_feed_view.dart';
 import 'package:provider/provider.dart';
 
 import 'core/constants/app/app_constants.dart';
@@ -10,7 +9,7 @@ import 'core/init/navigation/navigation_route.dart';
 import 'core/init/navigation/navigation_service.dart';
 import 'core/init/notifier/provider_list.dart';
 import 'core/init/notifier/theme_notifer.dart';
-import 'view/authenticate/login/view/login_view.dart';
+import 'view/home/build/feed/view/build_feed_view.dart';
 
 void main() {
   WidgetsFlutterBinding.ensureInitialized();
diff --git a/lib/view/_product/_constants/image_path_svg.dart b/lib/view/_product/_constants/image_path_svg.dart
@@ -1,15 +1,14 @@
-import 'package:fluttermvvmtemplate/core/extension/string_extension.dart';
+import '../../../core/extension/string_extension.dart';
 
 class SVGImagePaths {
   static SVGImagePaths _instace;
   static SVGImagePaths get instance {
-    if (_instace == null) _instace = SVGImagePaths._init();
-    return _instace;
+    return _instace ??= SVGImagePaths._init();
   }
 
   SVGImagePaths._init();
 
-  final relaxSVG = "relax".toSVG;
-  final astronautSVG = "astronaut".toSVG;
-  final chattingSVG = "chat".toSVG;
+  final relaxSVG = 'relax'.toSVG;
+  final astronautSVG = 'astronaut'.toSVG;
+  final chattingSVG = 'chat'.toSVG;
 }
diff --git a/lib/view/_product/_widgets/button/face_book_button.dart b/lib/view/_product/_widgets/button/face_book_button.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:fluttermvvmtemplate/core/components/button/title_text_button.dart';
+
+import '../../../../core/components/button/title_text_button.dart';
 
 class FaceBookButton extends StatelessWidget {
   final Function(FaceBookModel data, {String errorMessage}) onComplete;
@@ -9,14 +10,14 @@ class FaceBookButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return TitleTextButton(
-      text: "Facebbok login",
+      text: 'Facebbok login',
       onPressed: () {
-        final isLengthSixCharacter = "asdasdasd".length == 6;
+        final isLengthSixCharacter = 'asdasdasd'.length == 6;
 
         if (isLengthSixCharacter) {
-          this.onComplete(FaceBookModel("asdasd", "ASdasd"));
+          onComplete(FaceBookModel('asdasd', 'ASdasd'));
         } else {
-          this.onComplete(null, errorMessage: "Facebook user not found");
+          onComplete(null, errorMessage: 'Facebook user not found');
         }
       },
     );
diff --git a/lib/view/_product/_widgets/button/login_button.dart b/lib/view/_product/_widgets/button/login_button.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:fluttermvvmtemplate/core/components/button/icon_button.dart';
+
+import '../../../../core/components/button/icon_button.dart';
 
 class MVVMLoginButton extends StatelessWidget {
   final Function(String data) onComplete;
diff --git a/lib/view/_product/_widgets/listview/on_board_indicator.dart b/lib/view/_product/_widgets/listview/on_board_indicator.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:fluttermvvmtemplate/core/components/list-view/indicator_list_view.dart';
+import '../../../../core/components/list-view/indicator_list_view.dart';
 
 class OnBoardIndcator extends StatelessWidget {
   final int itemCount;
diff --git a/lib/view/authenticate/login/viewmodel/login_view_model.dart b/lib/view/authenticate/login/viewmodel/login_view_model.dart
@@ -20,7 +20,9 @@ abstract class _LoginViewModelBase with Store, BaseViewModel {
   TextEditingController emailController;
   TextEditingController passwordController;
 
+  @override
   void setContext(BuildContext context) => this.context = context;
+  @override
   void init() {
     loginService = LoginService(VexanaManager.instance.networkManager);
     emailController = TextEditingController();
@@ -41,7 +43,7 @@ abstract class _LoginViewModelBase with Store, BaseViewModel {
 
       if (response != null) {
         scaffoldState.currentState.showSnackBar(SnackBar(content: Text(response.token)));
-        localeManager.setStringValue(PreferencesKeys.TOKEN, response.token);
+        await localeManager.setStringValue(PreferencesKeys.TOKEN, response.token);
       }
     }
     isLoadingChange();
diff --git a/lib/view/authenticate/onboard/viewModel/on_board_view_model.dart b/lib/view/authenticate/onboard/viewModel/on_board_view_model.dart
diff --git a/lib/view/authenticate/test/model/test_model.dart b/lib/view/authenticate/test/model/test_model.dart
diff --git a/lib/view/authenticate/test/viewmodel/test_view_model.dart b/lib/view/authenticate/test/viewmodel/test_view_model.dart
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml
diff --git a/test/core/network/core_dio_mock.dart b/test/core/network/core_dio_mock.dart
diff --git a/test/core/network/dio_mock_model.dart b/test/core/network/dio_mock_model.dart
diff --git a/test/feature/login/login_test.dart b/test/feature/login/login_test.dart
diff --git a/test/feature/onboard/onboard_mock_view_model.dart b/test/feature/onboard/onboard_mock_view_model.dart
diff --git a/test/feature/onboard/onboard_test.dart b/test/feature/onboard/onboard_test.dart
diff --git a/test/feature/test/sample_view_test.dart b/test/feature/test/sample_view_test.dart

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+include: package:pedantic/analysis_options.1.9.0.yaml`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import 'package:fluttermvvmtemplate/core/init/network/IResponseModel.dart';`
	`1`	`+import '../../init/network/IResponseModel.dart';`
`2`	`2`
`3`	`3`	`class BaseError extends IErrorModel {`
`4`	`4`	`final String message;`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class NormalButton extends StatelessWidget {`
`11`	`11`	`return RaisedButton(`
`12`	`12`	`padding: EdgeInsets.all(15),`
`13`	`13`	`elevation: 10,`
`14`		`- onPressed: this.onPressed,`
	`14`	`+ onPressed: onPressed,`
`15`	`15`	`child: child,`
`16`	`16`	`);`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ class NotFoundNavigationWidget extends StatelessWidget {`
`4`	`4`	`@override`
`5`	`5`	`Widget build(BuildContext context) {`
`6`	`6`	`return Scaffold(`
`7`		`- body: Text("Not Found"),`
	`7`	`+ body: Text('Not Found'),`
`8`	`8`	`);`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@ import '../constants/app/app_constants.dart';`
`5`	`5`	`extension StringLocalization on String {`
`6`	`6`	`String get locale => this.tr();`
`7`	`7`
`8`		`- String get isValidEmail => this.contains(RegExp(ApplicationConstants.EMAIL_REGIEX)) ? null : "Email does not valid";`
	`8`	`+ String get isValidEmail => contains(RegExp(ApplicationConstants.EMAIL_REGIEX)) ? null : 'Email does not valid';`
`9`	`9`
`10`	`10`	`bool get isValidEmails => RegExp(ApplicationConstants.EMAIL_REGIEX).hasMatch(this);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`extension ImagePathExtension on String {`
`14`		`- String get toSVG => "asset/svg/$this.svg";`
	`14`	`+ String get toSVG => 'asset/svg/$this.svg';`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@ abstract class IErrorModel<T> {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`class ResponseModel<T> extends IResponseModel<T> {`
	`11`	`+ @override`
`11`	`12`	`final T data;`
	`13`	`+ @override`
`12`	`14`	`final IErrorModel error;`
`13`	`15`
`14`	`16`	`ResponseModel({this.data, this.error});`