Merge pull request #13 from Onix-Systems/feat/version_rising

update 1.0.14

Author: cozvtieg9

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/analysis_options.yaml

@@ -1,8 +1,6 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  plugins:
-    - dart_code_metrics
   exclude:
     - "build/**"
     - "**/*.g.dart"
@@ -14,6 +12,8 @@ analyzer:
     - "**/*.tailor.dart"
     - "ios/**"
     - "test/**"
+    - "lib/core/app/localization/**"
+
   errors:
     prefer_mixin: ignore
     flutter_style_todos: ignore
@@ -49,6 +49,12 @@ analyzer:
     use_build_context_synchronously: info
     use_key_in_widget_constructors: info
     valid_regexps: error
+    missing_required_param: error
+    missing_return: error
+    collection_methods_unrelated_type: warning
+    avoid_final_parameters: error
+    cast_nullable_to_non_nullable: warning
+    implicit_call_tearoffs: info
 
 linter:
   rules:
@@ -75,8 +81,7 @@ linter:
     control_flow_in_finally: true
     empty_statements: true
     hash_and_equals: true
-    iterable_contains_unrelated_type: true
-    list_remove_unrelated_type: true
+    collection_methods_unrelated_type: true
     literal_only_boolean_expressions: true
     no_adjacent_strings_in_list: true
     no_duplicate_case_values: true
@@ -90,6 +95,8 @@ linter:
     use_build_context_synchronously: true
     use_key_in_widget_constructors: true
     valid_regexps: true
+    avoid_dynamic_calls: true
+    invalid_case_patterns: true
 
     # Style rules.
     always_declare_return_types: true
@@ -155,7 +162,6 @@ linter:
     prefer_conditional_assignment: true
     prefer_constructors_over_static_methods: true
     prefer_contains: true
-    prefer_equal_for_default_values: true
     prefer_final_fields: true
     prefer_final_in_for_each: true
     prefer_final_locals: true
@@ -181,7 +187,7 @@ linter:
     recursive_getters: true
     sized_box_for_whitespace: true
     slash_for_doc_comments: true
-    sort_child_properties_last: false
+    sort_child_properties_last: true
     sort_constructors_first: false
     sort_unnamed_constructors_first: false
     type_annotate_public_apis: true
@@ -214,7 +220,7 @@ linter:
     use_string_buffers: true
     use_to_and_as_if_applicable: true
     void_checks: true
-    lines_longer_than_80_chars: false
+    lines_longer_than_80_chars: true
     flutter_style_todos: true
     conditional_uri_does_not_exist: true
     no_leading_underscores_for_library_prefixes: true
@@ -223,9 +229,37 @@ linter:
     sized_box_shrink_expand: true
     use_decorated_box: true
     use_colored_box: true
+    avoid_double_and_int_checks: true
+    avoid_final_parameters: true
+    avoid_redundant_argument_values: true
+    cast_nullable_to_non_nullable: true
+    combinators_ordering: true
+    dangling_library_doc_comments: true
+    eol_at_end_of_file: true
+    implicit_call_tearoffs: true
+    join_return_with_assignment: true
+    library_private_types_in_public_api: true
+    no_default_cases: true
+    noop_primitive_operations: true
+    null_check_on_nullable_type_parameter: true
+    package_prefixed_library_names: true
+    prefer_asserts_with_message: true
+    prefer_int_literals: true
+    prefer_null_aware_method_calls: true
+    require_trailing_commas: true
+    tighten_type_of_initializing_formals: true
+    unnecessary_constructor_name: true
+    unnecessary_library_directive: true
+    unnecessary_to_list_in_spreads: true
+    use_enums: true
+    use_string_in_part_of_directives: true
+    use_super_parameters: true
+    use_test_throws_matchers: true
+    unnecessary_breaks: true
 
     # Pub rules.
     package_names: true
+    depend_on_referenced_packages: true
 
 #https://github.com/dart-lang/lints/blob/main/lib/core.yaml
 #https://github.com/dart-lang/lints/blob/main/lib/recommended.yaml

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app.gen.dart

@@ -6,13 +6,13 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';{{/web_only}}
 import 'package:{{project_name}}/core/arch/bloc/base_block_state.dart';
 import 'package:{{project_name}}/app/bloc/app_bloc_imports.dart';
 import 'package:{{project_name}}/presentation/style/theme/theme_imports.dart';
-{{#isGoRouter}}import 'package:{{project_name}}/core/router/app_router.dart';{{/isGoRouter}}
+{{#isGoRouter}}import 'package:{{project_name}}/app/router/app_router.dart';{{/isGoRouter}}
 {{^isGoRouter}}import 'package:{{project_name}}/core/di/app.dart';{{/isGoRouter}}
 {{^handLocalization}}import 'package:flutter_localizations/flutter_localizations.dart';{{/handLocalization}}
-{{#handLocalization}}import 'package:{{project_name}}/core/app/localization/common_app_localization_ext.dart';
+{{#handLocalization}}import 'package:{{project_name}}/app/localization/common_app_localization_ext.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';{{/handLocalization}}
 {{#flavorizr}}import 'package:{{project_name}}/core/arch/widget/common/flavor_banner.dart';{{/flavorizr}}
-{{^handLocalization}}import 'package:{{project_name}}/core/app/localization/generated/l10n.dart';{{/handLocalization}}
+{{^handLocalization}}import 'package:{{project_name}}/app/localization/generated/l10n.dart';{{/handLocalization}}
 
 class App extends StatefulWidget {
   const App({super.key});
@@ -29,21 +29,19 @@ class _AppState extends BaseState<AppScreenState, AppBloc, AppSR, App> {
   Widget buildWidget(BuildContext context) {
     {{#isGoRouter}}AppRouter.init();{{/isGoRouter}}
     return {{^web_only}}GlobalLoaderOverlay(
-      useDefaultLoading: true,
       overlayColor: Colors.black,
       overlayOpacity: 0.5,
       child: ScreenUtilInit(
         designSize: const Size(375, 812),
         minTextAdapt: true,
-        splitScreenMode: false,
         builder: (context, child) {
         return{{/web_only}} blocConsumer(
           stateListener: (state) {
           return MaterialApp.router(
             debugShowCheckedModeBanner: false,
             builder: (context, widget) {
               return MediaQuery(
-                data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
+                data: MediaQuery.of(context).copyWith(textScaleFactor: 1),
                 {{#flavorizr}}
                 child: FlavorBanner(
                   child: widget ?? const SizedBox(),

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/app/app_initialization.dart renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/app_initialization.dart

@@ -1,15 +1,13 @@
 import 'package:get_it/get_it.dart';
 import 'package:{{project_name}}/core/di/app.dart';
 import 'package:{{project_name}}/core/di/injection.dart';
-import 'package:{{project_name}}/core/di/services.dart';
 
-class AppInitialization {
-  static final AppInitialization _instance =
-      AppInitialization._privateConstructor();
+class Initialization {
+  static final Initialization _instance = Initialization._privateConstructor();
 
-  static AppInitialization get I => _instance;
+  static Initialization get I => _instance;
 
-  AppInitialization._privateConstructor();
+  Initialization._privateConstructor();
 
   Future<void> initApp() async {
     //TODO init firebase / Crashlytics / Messaging

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/app/app_service.dart renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/app_service.dart

@@ -26,7 +26,7 @@ class AppService {
       }
     }
 
-    await dotenv.load(fileName: '.env');
+    await dotenv.load();
     return true;
   }
 

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/banned_app.dart

@@ -9,11 +9,11 @@ class BannedApp extends StatelessWidget {
       home: Scaffold(
         body: Center(
           child: Padding(
-            padding: EdgeInsets.all(8.0),
+            padding: EdgeInsets.all(8),
             child: Text(
               'App is not working on jail broken or rooted device.',
               textAlign: TextAlign.center,
-              style: TextStyle(fontSize: 32.0),
+              style: TextStyle(fontSize: 32),
             ),
           ),
         ),

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/constants.dart

@@ -0,0 +1,3 @@
+class Constants {
+  static const String filterParamAll = 'All';
+}

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/app/localization/l10n/app_en.arb renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/localization/l10n/app_en.arb

@@ -3,7 +3,7 @@
 {{#isGoRouter}}import 'package:flutter_bloc/flutter_bloc.dart';{{/isGoRouter}}
 import 'package:flutter/material.dart';
 {{#isGoRouter}}import 'package:go_router/go_router.dart';{{/isGoRouter}}
-{{^isGoRouter}}import 'package:{{project_name}}/core/router/guard/init_guard.dart';{{/isGoRouter}}
+{{^isGoRouter}}import 'package:{{project_name}}/app/router/guard/init_guard.dart';{{/isGoRouter}}
 import 'package:{{project_name}}/presentation/screen/home_screen.dart';
 //{imports end}
 

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/app/localization/l10n/intl_en.arb renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/localization/l10n/intl_en.arb

@@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:{{project_name}}/core/di/app.dart';
 import 'package:flutter/material.dart';
 
-import 'package:{{project_name}}/core/router/app_router.dart';
+import 'package:{{project_name}}/app/router/app_router.dart';
 
 class RouterLoggingObserver extends AutoRouterObserver {
   final AppRouter appRouter;
@@ -30,7 +30,8 @@ class RouterLoggingObserver extends AutoRouterObserver {
   @override
   void didReplace({Route? newRoute, Route? oldRoute}) {
     logger.w(
-        'ROUTING Route replaced to: ${newRoute?.settings.name} from: ${oldRoute?.settings.name}, stack${_stack()}',);
+        'ROUTING Route replaced to: ${newRoute?.settings.name} '
+        'from: ${oldRoute?.settings.name}, stack${_stack()}',);
   }
 
   @override

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/app/localization/{{#handLocalization}}common_app_localization_ext.dart{{/handLocalization}} renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/localization/{{#handLocalization}}common_app_localization_ext.dart{{/handLocalization}}

@@ -1,6 +1,6 @@
-import 'package:{{project_name}}/core/router/app_router.dart';
-import 'package:{{project_name}}/core/router/guard/init_guard.dart';
-import 'package:{{project_name}}/core/router/router_logging_observer.dart';
+import 'package:{{project_name}}/app/router/app_router.dart';
+import 'package:{{project_name}}/app/router/guard/init_guard.dart';
+import 'package:{{project_name}}/app/router/router_logging_observer.dart';
 
 abstract class RouterModule {
   AppRouter appRouter() {

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/router/app_router.dart renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/router/app_router.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:{{project_name}}/core/di/remote.dart';
 import 'package:{{project_name}}/core/di/repository.dart';
 import 'package:{{project_name}}/domain/entity/authentication/authentication.dart';
-import 'package:{{project_name}}/domain/service/session_service/session_status.dart';
+import 'package:{{project_name}}/app/service/session_service/session_status.dart';
 
 class SessionService {
   final StreamController<SessionStatus> _sessionObserver =

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/router/{{^isGoRouter}}guard{{/isGoRouter}}/{{^isGoRouter}}init_guard.dart{{/isGoRouter}} renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/router/{{^isGoRouter}}guard{{/isGoRouter}}/{{^isGoRouter}}init_guard.dart{{/isGoRouter}}

@@ -0,0 +1,28 @@
+{{#handLocalization}}import 'package:{{project_name}}/app/localization/common_app_localization_ext.dart';{{/handLocalization}}
+{{^handLocalization}}import 'package:{{project_name}}/app/localization/generated/l10n.dart';{{/handLocalization}}
+import 'package:{{project_name}}/core/arch/domain/entity/failure/api_failure.dart';
+import 'package:flutter/material.dart';
+
+extension FailureMessageExtension on BuildContext {
+String getApiFailureMessage(ApiFailure failure) {
+switch (failure.failure) {
+case ServerFailure.noNetwork:
+{{#handLocalization}}return str.apiFailureNoNetwork;{{/handLocalization}}
+{{^handLocalization}}return S.current.apiFailureNoNetwork;{{/handLocalization}}
+case ServerFailure.exception:
+    {{#handLocalization}}return str.apiFailureUndefined;{{/handLocalization}}
+    {{^handLocalization}}return S.current.apiFailureUndefined;{{/handLocalization}}
+    case ServerFailure.unAuthorized:
+    {{#handLocalization}}return str.apiFailureUnAuthorized;{{/handLocalization}}
+    {{^handLocalization}}return S.current.apiFailureUnAuthorized;{{/handLocalization}}
+    case ServerFailure.tooManyRequests:
+    {{#handLocalization}}return str.apiFailureTooManyRequests;{{/handLocalization}}
+    {{^handLocalization}}return S.current.apiFailureTooManyRequests;{{/handLocalization}}
+    case ServerFailure.response:
+    return failure.message;
+    case ServerFailure.unknown:
+    {{#handLocalization}}return str.apiFailureUndefined;{{/handLocalization}}
+    {{^handLocalization}}return S.current.apiFailureUndefined;{{/handLocalization}}
+    }
+  }
+}

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/router/{{^isGoRouter}}router_logging_observer.dart{{/isGoRouter}} renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/router/{{^isGoRouter}}router_logging_observer.dart{{/isGoRouter}}

@@ -55,7 +55,7 @@ class QaUtils {
           mainAxisAlignment: MainAxisAlignment.end,
           children: <Widget>[
             MaterialButton(
-              elevation: 10.0,
+              elevation: 10,
               child: const Text(
                 'Set proxy',
                 textDirection: TextDirection.ltr,
@@ -70,7 +70,7 @@ class QaUtils {
               },
             ),
             MaterialButton(
-              elevation: 10.0,
+              elevation: 10,
               child: const Text('Cancel'),
               onPressed: () {
                 Navigator.of(context, rootNavigator: true).pop(context);

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/router/{{^isGoRouter}}router_module.dart{{/isGoRouter}} renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/router/{{^isGoRouter}}router_module.dart{{/isGoRouter}}

@@ -17,7 +17,7 @@ abstract class BaseBloc<Event, State, SR> extends Bloc<Event, State>
 
   Stream<bool> get progressStream => _progressStreamController.stream;
 
-  BaseBloc(State initialState) : super(initialState) {
+  BaseBloc(super.initialState) {
     _errorStreamController = StreamController<Failure>.broadcast();
     _progressStreamController = StreamController<bool>.broadcast();
   }

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/domain/service/cipher_service.dart renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/service/cipher_service.dart

@@ -17,7 +17,7 @@ abstract class BaseCubit<State, SR> extends Cubit<State>
 
   Stream<bool> get progressStream => _progressStreamController.stream;
 
-  BaseCubit(State initialState) : super(initialState) {
+  BaseCubit(super.initialState) {
     _errorStreamController = StreamController<Failure>.broadcast();
     _progressStreamController = StreamController<bool>.broadcast();
   }

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/domain/service/hive_cipher_key_service.dart renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/service/hive_cipher_key_service.dart

@@ -19,8 +19,8 @@ class StreamListener<T> extends StatefulWidget {
     this.onError,
     this.onDone,
     this.cancelOnError,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<StreamListener<T>> createState() => _StreamListenerState<T>();

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/domain/service/session_service/session_service.dart renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/service/session_service/session_service.dart

@@ -6,19 +6,19 @@ class BasePreferences {
     T result;
 
     switch (defaultValue.runtimeType) {
-      case String:
+      case const (String):
         final value = prefs.getString(key) as T?;
         result = value ?? defaultValue;
         break;
-      case bool:
+      case const (bool):
         final value = prefs.getBool(key) as T?;
         result = value ?? defaultValue;
         break;
-      case double:
+      case const (double):
         final value = prefs.getDouble(key) as T?;
         result = value ?? defaultValue;
         break;
-      case int:
+      case const (int):
         final value = prefs.getInt(key) as T?;
         result = value ?? defaultValue;
         break;
@@ -31,16 +31,16 @@ class BasePreferences {
   Future<void> put<T>(String key, T value) async {
     final prefs = await SharedPreferences.getInstance();
     switch (value.runtimeType) {
-      case String:
+      case const (String):
         await prefs.setString(key, value as String);
         break;
-      case bool:
+      case const (bool):
         await prefs.setBool(key, value as bool);
         break;
-      case double:
+      case const (double):
         await prefs.setDouble(key, value as double);
         break;
-      case int:
+      case const (int):
         await prefs.setInt(key, value as int);
         break;
     }
@@ -55,4 +55,9 @@ class BasePreferences {
     final prefs = await SharedPreferences.getInstance();
     return prefs.remove(key);
   }
+
+  Future<void> reload() async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.reload();
+  }
 }