Merge pull request #116 from Onix-Systems/dev

Update 1.3.0 (30)

Author: cozvtieg9

Makefile

@@ -1,6 +1,13 @@
 
-build:
-	@flutter clean
-	@flutter build macos --release
+build_macos:
+	@rm -rf release
+	fvm flutter clean
+	fvm flutter build macos --release
 	@mkdir release
 	@appdmg installers/dmg_creator/config.json release/Onix_Flutter_Project_Generator.dmg
+
+build_runner:
+	fvm dart run build_runner build --delete-conflicting-outputs
+
+codegen:
+	dart run build_runner build --delete-conflicting-outputs

README.md

@@ -18,11 +18,16 @@
 <br/>
 
 <div align="center"><strong>How does it work?  Watch the video!</strong></div>
+<br/>
+
+https://github.com/user-attachments/assets/5fd10595-2964-4006-8926-4715e1032cba
 
+<br/>
 <div align="center">
 <a href="https://www.youtube.com/watch?v=E8kBX7HoqMU">
     <img alt="refine logo" src="images/watch_yt_normal.png">
 </a>
+
 </div>
 
 <br/>
@@ -77,7 +82,7 @@ Also there an option to select **optional packages to include** to the project:
 * **Localization** - [Intl](https://pub.dev/packages/intl_utils)
 * **Theming** - [ThemeTailor](https://pub.dev/packages/theme_tailor)
 * **UI** - [ScreenUtil](https://pub.dev/packages/flutter_screenutil)
-
+* **Monitor and capture errors** - [Sentry](https://pub.dev/packages/sentry_flutter)
 
 ## Key Features
 
@@ -108,4 +113,4 @@ If you have any doubts related to the project or want to discuss something, then
 
 ## License
 
-Licensed under the MIT License, Copyright (c) 2023-present Onix-Systems
+Licensed under the MIT License, Copyright (c) 2024-present Onix-Systems

analysis_options.yaml

@@ -14,22 +14,253 @@ analyzer:
     - "bricks/**"
     - '**/*.g.dart'
     - '**/*.freezed.dart'
+    - "lib/app/localization/**"
+
+  errors:
+    prefer_mixin: ignore
+    flutter_style_todos: ignore
+    invalid_annotation_target: ignore
+    always_use_package_imports: warning
+    avoid_dynamic_calls: info
+    avoid_empty_else: error
+    avoid_print: warning
+    avoid_relative_lib_imports: warning
+    avoid_returning_null_for_future: error
+    avoid_slow_async_io: warning
+    avoid_type_to_string: error
+    avoid_types_as_parameter_names: info
+    avoid_web_libraries_in_flutter: error
+    cancel_subscriptions: error
+    close_sinks: error
+    comment_references: info
+    control_flow_in_finally: error
+    empty_statements: error
+    hash_and_equals: error
+    iterable_contains_unrelated_type: error
+    list_remove_unrelated_type: error
+    literal_only_boolean_expressions: warning
+    no_adjacent_strings_in_list: error
+    no_duplicate_case_values: error
+    no_logic_in_create_state: error
+    prefer_void_to_null: error
+    test_types_in_equals: error
+    throw_in_finally: error
+    unnecessary_statements: error
+    unrelated_type_equality_checks: error
+    unsafe_html: error
+    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:
-  # The lint rules applied to this project can be customized in the
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
-  # included above or to enable additional rules. A list of all available lints
-  # and their documentation is published at
-  # https://dart-lang.github.io/linter/lints/index.html.
-  #
-  # Instead of disabling a lint rule for the entire project in the
-  # section below, it can also be suppressed for a single line of code
-  # or a specific dart file by using the `// ignore: name_of_lint` and
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
-  # producing the lint.
   rules:
-  # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-  # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+    # Const rules.
+    prefer_const_constructors: true
+    prefer_const_constructors_in_immutables: true
+    prefer_const_declarations: true
+    prefer_const_literals_to_create_immutables: true
+    unnecessary_const: true
+    unnecessary_late: true
+
+    # Error rules.
+    always_use_package_imports: true
+    avoid_empty_else: true
+    avoid_print: true
+    avoid_relative_lib_imports: true
+    avoid_slow_async_io: true
+    avoid_type_to_string: true
+    avoid_types_as_parameter_names: true
+    avoid_web_libraries_in_flutter: true
+    cancel_subscriptions: true
+    close_sinks: true
+    control_flow_in_finally: true
+    empty_statements: true
+    hash_and_equals: true
+    collection_methods_unrelated_type: true
+    literal_only_boolean_expressions: true
+    no_adjacent_strings_in_list: true
+    no_duplicate_case_values: true
+    no_logic_in_create_state: true
+    prefer_void_to_null: true
+    test_types_in_equals: true
+    throw_in_finally: true
+    unnecessary_statements: true
+    unrelated_type_equality_checks: true
+    unsafe_html: true
+    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
+    always_put_required_named_parameters_first: true
+    annotate_overrides: true
+    avoid_annotating_with_dynamic: true
+    avoid_bool_literals_in_conditional_expressions: true
+    avoid_catching_errors: true
+    avoid_equals_and_hash_code_on_mutable_classes: true
+    avoid_escaping_inner_quotes: true
+    avoid_field_initializers_in_const_classes: true
+    avoid_function_literals_in_foreach_calls: true
+    avoid_implementing_value_types: true
+    avoid_init_to_null: true
+    avoid_js_rounded_ints: true
+    avoid_multiple_declarations_per_line: true
+    avoid_null_checks_in_equality_operators: true
+    avoid_positional_boolean_parameters: true
+    avoid_private_typedef_functions: true
+    avoid_renaming_method_parameters: true
+    avoid_return_types_on_setters: true
+    avoid_returning_null_for_void: true
+    avoid_returning_this: true
+    avoid_setters_without_getters: true
+    avoid_shadowing_type_parameters: true
+    avoid_single_cascade_in_expression_statements: true
+    avoid_types_on_closure_parameters: true
+    avoid_unnecessary_containers: true
+    avoid_unused_constructor_parameters: true
+    avoid_void_async: true
+    await_only_futures: true
+    camel_case_extensions: true
+    camel_case_types: true
+    cascade_invocations: true
+    constant_identifier_names: true
+    curly_braces_in_flow_control_structures: true
+    deprecated_consistency: true
+    directives_ordering: true
+    do_not_use_environment: true
+    empty_catches: true
+    empty_constructor_bodies: true
+    exhaustive_cases: true
+    file_names: true
+    implementation_imports: true
+    leading_newlines_in_multiline_strings: true
+    library_names: true
+    library_prefixes: true
+    missing_whitespace_between_adjacent_strings: true
+    no_runtimeType_toString: true
+    non_constant_identifier_names: true
+    null_closures: true
+    omit_local_variable_types: true
+    one_member_abstracts: true
+    only_throw_errors: true
+    overridden_fields: true
+    package_api_docs: true
+    parameter_assignments: true
+    prefer_adjacent_string_concatenation: true
+    prefer_asserts_in_initializer_lists: true
+    prefer_collection_literals: true
+    prefer_conditional_assignment: true
+    prefer_constructors_over_static_methods: true
+    prefer_contains: true
+    prefer_final_fields: true
+    prefer_final_in_for_each: true
+    prefer_final_locals: true
+    prefer_for_elements_to_map_fromIterable: true
+    prefer_function_declarations_over_variables: true
+    prefer_generic_function_type_aliases: true
+    prefer_if_elements_to_conditional_expressions: true
+    prefer_if_null_operators: true
+    prefer_initializing_formals: true
+    prefer_inlined_adds: true
+    prefer_interpolation_to_compose_strings: true
+    prefer_is_empty: true
+    prefer_is_not_empty: true
+    prefer_is_not_operator: true
+    prefer_iterable_whereType: true
+    prefer_mixin: true
+    prefer_null_aware_operators: true
+    prefer_single_quotes: true
+    prefer_spread_collections: true
+    prefer_typing_uninitialized_variables: true
+    provide_deprecation_message: true
+    public_member_api_docs: false
+    recursive_getters: true
+    sized_box_for_whitespace: true
+    slash_for_doc_comments: true
+    sort_child_properties_last: true
+    sort_constructors_first: false
+    sort_unnamed_constructors_first: false
+    type_annotate_public_apis: true
+    type_init_formals: true
+    unawaited_futures: true
+    unnecessary_await_in_return: true
+    unnecessary_brace_in_string_interps: true
+    unnecessary_getters_setters: true
+    unnecessary_lambdas: true
+    unnecessary_new: true
+    unnecessary_null_aware_assignments: true
+    unnecessary_null_checks: true
+    unnecessary_null_in_if_null_operators: true
+    unnecessary_nullable_for_final_variable_declarations: true
+    unnecessary_overrides: true
+    unnecessary_parenthesis: true
+    unnecessary_raw_strings: true
+    unnecessary_string_escapes: true
+    unnecessary_string_interpolations: true
+    unnecessary_this: true
+    use_full_hex_values_for_flutter_colors: true
+    use_function_type_syntax_for_parameters: true
+    use_if_null_to_convert_nulls_to_bools: true
+    use_is_even_rather_than_modulo: true
+    use_late_for_private_fields_and_variables: true
+    use_named_constants: true
+    use_raw_strings: true
+    use_rethrow_when_possible: true
+    use_setters_to_change_properties: true
+    use_string_buffers: true
+    use_to_and_as_if_applicable: true
+    void_checks: true
+    lines_longer_than_80_chars: true
+    flutter_style_todos: true
+    conditional_uri_does_not_exist: true
+    no_leading_underscores_for_library_prefixes: true
+    no_leading_underscores_for_local_identifiers: true
+    secure_pubspec_urls: true
+    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
 
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
+#https://github.com/dart-lang/lints/blob/main/lib/core.yaml
+#https://github.com/dart-lang/lints/blob/main/lib/recommended.yaml
+#https://github.com/flutter/packages/blob/master/packages/flutter_lints/lib/flutter.yaml
+#https://pub.dev/packages/dart_code_metrics

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/.env

@@ -1,2 +1,2 @@
-APIKEY1 = 'APIKEY1'
-APIKEY2 = 'APIKEY2'
+APIKEY1=APIKEY1
+APIKEY2=APIKEY2

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

@@ -3,16 +3,16 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 {{^web_only}}import 'package:loader_overlay/loader_overlay.dart';{{/web_only}}
 {{#screen_util}}import 'package:flutter_screenutil/flutter_screenutil.dart';{{/screen_util}}
-import 'package:{{project_name}}/core/arch/bloc/base_bloc_state.dart';
-import 'package:{{project_name}}/app/bloc/app_bloc_imports.dart';
 import 'package:{{project_name}}/presentation/style/theme/theme_imports.dart';
+import 'package:{{project_name}}/core/arch/widget/common/theme_switcher.dart';
 {{#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}}/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}}/app/localization/generated/l10n.dart';{{/handLocalization}}
+{{^isGoRouter}}{{#sentry}}import 'package:sentry_flutter/sentry_flutter.dart';{{/sentry}}{{/isGoRouter}}
 
 class App extends StatefulWidget {
   const App({super.key});
@@ -21,12 +21,11 @@ class App extends StatefulWidget {
   State<App> createState() => _AppState();
 }
 
-class _AppState extends BaseState<AppScreenState, AppBloc, AppSR, App> {
+class _AppState extends State<App> {
   Locale? locale;
 
-
   @override
-  Widget buildWidget(BuildContext context) {
+  Widget build(BuildContext context) {
     {{#isGoRouter}}AppRouter.init();{{/isGoRouter}}
     return {{^web_only}}GlobalLoaderOverlay(
       overlayColor: Colors.black.withOpacity(0.5),
@@ -35,8 +34,9 @@ class _AppState extends BaseState<AppScreenState, AppBloc, AppSR, App> {
         designSize: const Size(375, 812),
         minTextAdapt: true,
         builder: (context, child) {
-        return{{/screen_util}} blocBuilder(
-          builder: (context, state) {
+        return{{/screen_util}}
+          ThemeModeSwitcher(
+              builder: (context, themeMode, _) {
           return MaterialApp.router(
             debugShowCheckedModeBanner: false,
             builder: (context, widget) {
@@ -55,12 +55,17 @@ class _AppState extends BaseState<AppScreenState, AppBloc, AppSR, App> {
             scrollBehavior: const CupertinoScrollBehavior(),
             theme: createLightTheme(),
             darkTheme: createDarkTheme(),
-            themeMode: state.themeMode,
-            {{#isGoRouter}}routeInformationProvider: AppRouter.router.routeInformationProvider,{{/isGoRouter}}
-            routeInformationParser: {{#isGoRouter}}AppRouter.router.routeInformationParser,{{/isGoRouter}}
-            {{^isGoRouter}}appRouter().defaultRouteParser(),{{/isGoRouter}}
-            routerDelegate: {{#isGoRouter}}AppRouter.router.routerDelegate,{{/isGoRouter}}
-            {{^isGoRouter}}appRouter().delegate(),{{/isGoRouter}}
+            themeMode: themeMode,
+            {{^isGoRouter}}
+            {{^sentry}}routerConfig: appRouter().config(),{{/sentry}}
+            {{#sentry}}routerConfig: appRouter().config(
+              navigatorObservers: () => [
+                 SentryNavigatorObserver(),
+              ],
+            ),
+            {{/sentry}}
+            {{/isGoRouter}}
+            {{#isGoRouter}}routerConfig: AppRouter.router,{{/isGoRouter}}
             locale: locale,
             {{^handLocalization}}
             localizationsDelegates: const [