Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
vanlooverenkoen committed Jun 5, 2023
1 parent aceaa59 commit 5e31799
Show file tree
Hide file tree
Showing 20 changed files with 141 additions and 332 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
@@ -1,4 +1,7 @@
# Changelog
## [12.0.0] - 2023-06-05
Updated to intl 0.18.x

## [11.0.0] - 2023-01-11
### BREAKING CHANGE!!
- After some time of using the new locale_gen package. It made our lifes harder than before.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 Koen Van Looveren
Copyright (c) 2023 Koen Van Looveren

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
131 changes: 14 additions & 117 deletions analysis_options.yaml
@@ -1,3 +1,5 @@
include: package:flutter_lints/flutter.yaml

analyzer:
errors:
missing_required_param: error
Expand All @@ -6,123 +8,18 @@ analyzer:
sdk_version_async_exported_from_core: ignore
exclude:
- '**.g.dart'
- '**coverage_helper_test.dart'
- '**.mocks.dart'
language:
strict-casts: true
strict-raw-types: true

linter:
rules:
- always_put_required_named_parameters_first
- always_require_non_null_named_parameters
- annotate_overrides
- avoid_bool_literals_in_conditional_expressions
- avoid_catching_errors
- avoid_double_and_int_checks
- avoid_empty_else
- avoid_field_initializers_in_const_classes
- avoid_implementing_value_types
- avoid_init_to_null
- avoid_js_rounded_ints
- avoid_null_checks_in_equality_operators
- avoid_positional_boolean_parameters
- avoid_private_typedef_functions
- avoid_relative_lib_imports
- avoid_renaming_method_parameters
- avoid_return_types_on_setters
- avoid_returning_null
- avoid_returning_null_for_future
- avoid_returning_null_for_void
- avoid_returning_this
- avoid_setters_without_getters
- avoid_shadowing_type_parameters
- avoid_single_cascade_in_expression_statements
- avoid_slow_async_io
- avoid_types_as_parameter_names
- avoid_types_on_closure_parameters
- avoid_unused_constructor_parameters
- avoid_void_async
- await_only_futures
- camel_case_types
- cancel_subscriptions
- cascade_invocations
- close_sinks
- comment_references
- control_flow_in_finally
- curly_braces_in_flow_control_structures
- directives_ordering
- empty_catches
- empty_constructor_bodies
- empty_statements
- file_names
- hash_and_equals
- implementation_imports
- invariant_booleans
- iterable_contains_unrelated_type
- join_return_with_assignment
- library_names
- library_prefixes
- list_remove_unrelated_type
- literal_only_boolean_expressions
- no_adjacent_strings_in_list
- no_duplicate_case_values
- non_constant_identifier_names
- null_closures
- omit_local_variable_types
- one_member_abstracts
- only_throw_errors
- overridden_fields
- package_api_docs
- package_names
- package_prefixed_library_names
- parameter_assignments
- prefer_adjacent_string_concatenation
- prefer_asserts_in_initializer_lists
- prefer_conditional_assignment
- prefer_const_constructors
- prefer_const_constructors_in_immutables
- prefer_const_declarations
- prefer_const_literals_to_create_immutables
- prefer_constructors_over_static_methods
- prefer_contains
- prefer_equal_for_default_values
- prefer_final_fields
- prefer_final_in_for_each
- prefer_final_locals
- prefer_foreach
- prefer_function_declarations_over_variables
- prefer_generic_function_type_aliases
- prefer_initializing_formals
- prefer_int_literals
- prefer_interpolation_to_compose_strings
- prefer_is_empty
- prefer_is_not_empty
- prefer_iterable_whereType
- prefer_null_aware_operators
- prefer_single_quotes
- prefer_typing_uninitialized_variables
- prefer_void_to_null
- recursive_getters
- slash_for_doc_comments
- sort_pub_dependencies
- test_types_in_equals
- throw_in_finally
- type_init_formals
- unawaited_futures
- unnecessary_await_in_return
- unnecessary_brace_in_string_interps
- unnecessary_const
- unnecessary_getters_setters
- unnecessary_lambdas
- unnecessary_new
- unnecessary_null_aware_assignments
- unnecessary_null_in_if_null_operators
- unnecessary_overrides
- unnecessary_parenthesis
- unnecessary_statements
- unnecessary_this
- unrelated_type_equality_checks
- use_full_hex_values_for_flutter_colors
- use_rethrow_when_possible
- use_setters_to_change_properties
- use_string_buffers
- use_to_and_as_if_applicable
- valid_regexps
- void_checks
unawaited_futures: true
always_declare_return_types: true
unsafe_html: true
use_full_hex_values_for_flutter_colors: true
prefer_final_in_for_each: true
prefer_final_fields: true
prefer_final_locals: true
avoid_print: false
134 changes: 14 additions & 120 deletions example/analysis_options.yaml
@@ -1,131 +1,25 @@
include: package:flutter_lints/flutter.yaml

analyzer:
errors:
missing_required_param: error
missing_return: error
todo: ignore
sdk_version_async_exported_from_core: ignore
strong-mode:
implicit-casts: false
implicit-dynamic: false
exclude:
- '**.g.dart'
- '**.mocks.dart'
language:
strict-casts: true
strict-raw-types: true

linter:
rules:
- always_put_required_named_parameters_first
- always_require_non_null_named_parameters
- annotate_overrides
- avoid_annotating_with_dynamic
- avoid_bool_literals_in_conditional_expressions
- avoid_catching_errors
- avoid_double_and_int_checks
- avoid_empty_else
- avoid_field_initializers_in_const_classes
- avoid_implementing_value_types
- avoid_init_to_null
- avoid_js_rounded_ints
- avoid_null_checks_in_equality_operators
- avoid_positional_boolean_parameters
- avoid_private_typedef_functions
- avoid_relative_lib_imports
- avoid_renaming_method_parameters
- avoid_return_types_on_setters
- avoid_returning_null
- avoid_returning_null_for_future
- avoid_returning_null_for_void
- avoid_returning_this
- avoid_setters_without_getters
- avoid_shadowing_type_parameters
- avoid_single_cascade_in_expression_statements
- avoid_slow_async_io
- avoid_types_as_parameter_names
- avoid_types_on_closure_parameters
- avoid_unused_constructor_parameters
- avoid_void_async
- await_only_futures
- camel_case_types
- cancel_subscriptions
- cascade_invocations
- close_sinks
- comment_references
- control_flow_in_finally
- curly_braces_in_flow_control_structures
- directives_ordering
- empty_catches
- empty_constructor_bodies
- empty_statements
- file_names
- hash_and_equals
- implementation_imports
- invariant_booleans
- iterable_contains_unrelated_type
- join_return_with_assignment
- library_names
- library_prefixes
- list_remove_unrelated_type
- literal_only_boolean_expressions
- no_adjacent_strings_in_list
- no_duplicate_case_values
- non_constant_identifier_names
- null_closures
- omit_local_variable_types
- one_member_abstracts
- only_throw_errors
- overridden_fields
- package_api_docs
- package_names
- package_prefixed_library_names
- parameter_assignments
- prefer_adjacent_string_concatenation
- prefer_asserts_in_initializer_lists
- prefer_conditional_assignment
- prefer_const_constructors
- prefer_const_constructors_in_immutables
- prefer_const_declarations
- prefer_const_literals_to_create_immutables
- prefer_constructors_over_static_methods
- prefer_contains
- prefer_equal_for_default_values
- prefer_final_fields
- prefer_final_in_for_each
- prefer_final_locals
- prefer_foreach
- prefer_function_declarations_over_variables
- prefer_generic_function_type_aliases
- prefer_initializing_formals
- prefer_int_literals
- prefer_interpolation_to_compose_strings
- prefer_is_empty
- prefer_is_not_empty
- prefer_iterable_whereType
- prefer_null_aware_operators
- prefer_single_quotes
- prefer_typing_uninitialized_variables
- prefer_void_to_null
- recursive_getters
- slash_for_doc_comments
- sort_pub_dependencies
- test_types_in_equals
- throw_in_finally
- type_init_formals
- unawaited_futures
- unnecessary_await_in_return
- unnecessary_brace_in_string_interps
- unnecessary_const
- unnecessary_getters_setters
- unnecessary_lambdas
- unnecessary_new
- unnecessary_null_aware_assignments
- unnecessary_null_in_if_null_operators
- unnecessary_overrides
- unnecessary_parenthesis
- unnecessary_statements
- unnecessary_this
- unrelated_type_equality_checks
- use_full_hex_values_for_flutter_colors
- use_rethrow_when_possible
- use_setters_to_change_properties
- use_string_buffers
- use_to_and_as_if_applicable
- valid_regexps
- void_checks
unawaited_futures: true
always_declare_return_types: true
unsafe_html: true
use_full_hex_values_for_flutter_colors: true
prefer_final_in_for_each: true
prefer_final_fields: true
prefer_final_locals: true
avoid_print: false
4 changes: 3 additions & 1 deletion example/lib/app.dart
Expand Up @@ -7,6 +7,8 @@ import 'package:locale_gen_example/viewmodel/locale/locale_viewmodel.dart';
import 'package:provider/provider.dart';

class MyApp extends StatelessWidget {
const MyApp({super.key});

@override
Widget build(BuildContext context) {
return ChangeNotifierProvider<LocaleViewModel>(
Expand All @@ -23,7 +25,7 @@ class MyApp extends StatelessWidget {
],
locale: viewModel.localeDelegate.activeLocale,
supportedLocales: LocalizationDelegate.supportedLocales,
home: HomeScreen(),
home: const HomeScreen(),
),
),
create: (context) => LocaleViewModel(LocaleRepository())..init(),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/main.dart
Expand Up @@ -2,5 +2,5 @@ import 'package:flutter/material.dart';
import 'package:locale_gen_example/app.dart';

Future<void> main() async {
runApp(MyApp());
runApp(const MyApp());
}
8 changes: 4 additions & 4 deletions example/lib/repository/locale_repository.dart
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/widgets.dart';
import 'package:shared_preferences/shared_preferences.dart';

class LocaleRepository {
static const STORE_LOCALE = 'locale';
static const storeLocale = 'locale';
static LocaleRepository? _instance;

LocaleRepository._();
Expand All @@ -13,16 +13,16 @@ class LocaleRepository {
final prefs = await SharedPreferences.getInstance();
if (locale == null) {
print('Reset custom locale. Use system language');
await prefs.remove(STORE_LOCALE);
await prefs.remove(storeLocale);
return;
}
await prefs.setString(STORE_LOCALE, locale.languageCode);
await prefs.setString(storeLocale, locale.languageCode);
}

//can be null
Future<Locale?> getCustomLocale() async {
final prefs = await SharedPreferences.getInstance();
final localeCode = prefs.getString(STORE_LOCALE);
final localeCode = prefs.getString(storeLocale);
if (localeCode == null || localeCode.isEmpty) return null;
return Locale(localeCode);
}
Expand Down

0 comments on commit 5e31799

Please sign in to comment.