Skip to content

Commit

Permalink
splash v1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ueman committed Oct 4, 2024
1 parent 19a992e commit 821dd40
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 213 deletions.
4 changes: 4 additions & 0 deletions splash/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [1.2.0]

- Fixes various deprecation lints

## [1.1.0]

- Deprecate NoSplash, please use https://api.flutter.dev/flutter/material/NoSplash-class.html
Expand Down
175 changes: 7 additions & 168 deletions splash/analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,170 +1,9 @@
include: package:flutter_lints/flutter.yaml

analyzer:
strong-mode:
implicit-dynamic: false
language:
strict-raw-types: true
strict-inference: true
strict-casts: true
errors:
# treat missing required parameters as a warning (not a hint)
missing_required_param: warning
# treat missing returns as a warning (not a hint)
missing_return: warning
# allow having TODOs in the code
todo: ignore
# Ignore analyzer hints for updating pubspecs when using Future or
# Stream and not importing dart:async
# Please see https://github.com/flutter/flutter/pull/24528 for details.
sdk_version_async_exported_from_core: ignore
exclude:
- "**/*.g.dart" # autogenerierte Dateien
- "lib/generated/**"
# Aus der Flutter Source kopiert und angepasst, entspricht daher dem Flutter Style Guide
- "lib/widgets/custom_list_tile.dart"

linter:
rules:
# these rules are documented on and in the same order as
# the Dart Lint rules page to make maintenance easier
# https://github.com/dart-lang/linter/blob/master/example/all.yaml
- always_declare_return_types
- always_put_control_body_on_new_line
# - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219
- always_require_non_null_named_parameters
# - always_specify_types # wir wollen nicht immer einen Typen angeben
- annotate_overrides
# - avoid_annotating_with_dynamic # conflicts with always_specify_types
# - avoid_as
- avoid_bool_literals_in_conditional_expressions
# - avoid_catches_without_on_clauses
- avoid_catching_errors
- avoid_classes_with_only_static_members
# - avoid_double_and_int_checks # only useful when targeting JS runtime
- avoid_empty_else
- avoid_field_initializers_in_const_classes
- avoid_function_literals_in_foreach_calls
# - avoid_implementing_value_types # not yet tested
- avoid_init_to_null
# - avoid_js_rounded_ints # only useful when targeting JS runtime
- avoid_null_checks_in_equality_operators
# - avoid_positional_boolean_parameters # not yet tested
# - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
- avoid_relative_lib_imports
- avoid_renaming_method_parameters
- avoid_return_types_on_setters
# - avoid_returning_null # there are plenty of valid reasons to return null
# - avoid_returning_null_for_future # not yet tested
- avoid_returning_null_for_void
# - avoid_returning_this # there are plenty of valid reasons to return this
# - avoid_setters_without_getters # not yet tested
# - avoid_shadowing_type_parameters # not yet tested
# - avoid_single_cascade_in_expression_statements # not yet tested
- avoid_slow_async_io
- avoid_types_as_parameter_names
# - avoid_types_on_closure_parameters # conflicts with always_specify_types
- avoid_unused_constructor_parameters
- avoid_void_async
- await_only_futures
- camel_case_types
- cancel_subscriptions
# - cascade_invocations # not yet tested
# - close_sinks # not reliable enough
# - comment_references # blocked on https://github.com/flutter/flutter/issues/20765
# - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204
- control_flow_in_finally
# - curly_braces_in_flow_control_structures # not yet tested
# - diagnostic_describe_all_properties # not yet tested
- directives_ordering
- empty_catches
- empty_constructor_bodies
- empty_statements
- file_names
- hash_and_equals
- implementation_imports
# - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811
- iterable_contains_unrelated_type
# - join_return_with_assignment # not yet tested
- library_names
- library_prefixes
- lines_longer_than_80_chars
- list_remove_unrelated_type
# - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/sdk/issues/34181
- no_adjacent_strings_in_list
- no_duplicate_case_values
- non_constant_identifier_names
# - null_closures # not yet tested
# - omit_local_variable_types # opposite of always_specify_types
# - one_member_abstracts # too many false positives
# - only_throw_errors # https://github.com/flutter/flutter/issues/5792
- overridden_fields
- package_api_docs
- package_names
- package_prefixed_library_names
- parameter_assignments
- prefer_adjacent_string_concatenation
- prefer_asserts_in_initializer_lists
# - prefer_asserts_with_message
- prefer_collection_literals
- 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_double_quotes # opposite of prefer_single_quotes
- prefer_equal_for_default_values
# - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
- prefer_final_fields
- prefer_final_in_for_each
- prefer_final_locals
- prefer_for_elements_to_map_fromIterable
- prefer_foreach
- prefer_function_declarations_over_variables
- prefer_generic_function_type_aliases
- prefer_if_elements_to_conditional_expressions
# - prefer_if_null_operators noch nicht kompatibel mit Flutter
- prefer_initializing_formals
- prefer_inlined_adds
- prefer_int_literals
- prefer_interpolation_to_compose_strings
- prefer_is_empty
- prefer_is_not_empty
- prefer_iterable_whereType
# - prefer_mixin # https://github.com/dart-lang/language/issues/32
# - prefer_null_aware_operators # disable until NNBD, see https://github.com/flutter/flutter/pull/32711#issuecomment-492930932
- prefer_single_quotes
- prefer_spread_collections
- prefer_typing_uninitialized_variables
- prefer_void_to_null
- provide_deprecation_message
# - public_member_api_docs # enabled on a case-by-case basis; see e.g. packages/analysis_options.yaml
- recursive_getters
- slash_for_doc_comments
# - sort_child_properties_last # noch nicht mit Flutter kompatibel
- sort_constructors_first
- sort_pub_dependencies
- sort_unnamed_constructors_first
- test_types_in_equals
- throw_in_finally
# - type_annotate_public_apis # subset of always_specify_types
- type_init_formals
# - unawaited_futures # too many false positives
- unnecessary_await_in_return
- unnecessary_brace_in_string_interps
- unnecessary_const
- unnecessary_getters_setters
# - unnecessary_lambdas # has false positives: https://github.com/dart-lang/linter/issues/498
- unnecessary_new
- unnecessary_null_aware_assignments
- unnecessary_null_in_if_null_operators
- unnecessary_overrides
- unnecessary_parenthesis
- unnecessary_statements
- unnecessary_this
- unrelated_type_equality_checks
# - unsafe_html # noch nicht verfügbar
- use_full_hex_values_for_flutter_colors
- use_function_type_syntax_for_parameters # not yet tested
- use_rethrow_when_possible
- use_setters_to_change_properties
# - use_string_buffers # has false positives: https://github.com/dart-lang/sdk/issues/34182
# - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review
- valid_regexps
- void_checks
todo: ignore
18 changes: 10 additions & 8 deletions splash/example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ void main() {
}

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

@override
Widget build(BuildContext context) {
return MaterialApp(
Expand All @@ -20,7 +22,7 @@ class MyApp extends StatelessWidget {
}

class MyHomePage extends StatelessWidget {
const MyHomePage({Key? key, required this.title}) : super(key: key);
const MyHomePage({super.key, required this.title});

final String title;

Expand Down Expand Up @@ -146,15 +148,15 @@ class MyHomePage extends StatelessWidget {
padding: const EdgeInsets.all(16),
child: Text(
'Default theme with splash factory',
style: Theme.of(context).textTheme.headline6,
style: Theme.of(context).textTheme.titleLarge,
),
),
...simpleSamples,
Padding(
padding: const EdgeInsets.all(16),
child: Text(
'Customized theme with splash factory',
style: Theme.of(context).textTheme.headline6,
style: Theme.of(context).textTheme.titleLarge,
),
),
...complexSamples,
Expand Down Expand Up @@ -187,12 +189,12 @@ class MyHomePage extends StatelessWidget {
}

class Sample extends StatefulWidget {
const Sample({Key? key, required this.name}) : super(key: key);
const Sample({super.key, required this.name});

final String name;

@override
_SampleState createState() => _SampleState();
State<Sample> createState() => _SampleState();
}

class _SampleState extends State<Sample> {
Expand Down Expand Up @@ -250,25 +252,25 @@ class _SampleState extends State<Sample> {
body: Column(
children: <Widget>[
ElevatedButton(
child: const Text('RaisedButton'),
onPressed: () {},
style: ElevatedButton.styleFrom(
splashFactory: Theme.of(context).splashFactory,
),
child: const Text('ElevatedButton'),
),
TextButton(
child: const Text('FlatButton'),
onPressed: () {},
style: TextButton.styleFrom(
splashFactory: Theme.of(context).splashFactory,
),
child: const Text('TextButton'),
),
OutlinedButton(
child: const Text('OutlineButton'),
onPressed: () {},
style: OutlinedButton.styleFrom(
splashFactory: Theme.of(context).splashFactory,
),
child: const Text('OutlineButton'),
),
IconButton(
icon: const Icon(Icons.settings),
Expand Down
4 changes: 2 additions & 2 deletions splash/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ publish_to: 'none'
version: 1.0.0+1

environment:
sdk: '>=2.12.0-259.9.beta < 3.0.0'
flutter: '>=1.26.0-17.6.pre'
sdk: ^3.0.0
flutter: '>=2.0.0'

dependencies:
flutter:
Expand Down
2 changes: 0 additions & 2 deletions splash/lib/splash.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
library splash;

export 'src/line_splash.dart';
export 'src/no_splash.dart';
export 'src/path_splash.dart';
Expand Down
8 changes: 3 additions & 5 deletions splash/lib/src/line_splash.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,13 @@ class _LineSplashFactory extends InteractiveInkFeatureFactory {
class LineSplash extends InteractiveInkFeature {
LineSplash({
required MaterialInkController controller,
required RenderBox referenceBox,
required super.referenceBox,
required Color color,
VoidCallback? onRemoved,
super.onRemoved,
Paint? newPaint,
}) : super(
controller: controller,
referenceBox: referenceBox,
color: color,
onRemoved: onRemoved,
) {
// Start animation as soon as possible
_progressController = AnimationController(
Expand Down Expand Up @@ -97,7 +95,7 @@ class LineSplash extends InteractiveInkFeature {

@override
void paintFeature(Canvas canvas, Matrix4 transform) {
// TODO: add support for rtl
// TODO(any): add support for rtl

final progress = _progressAnimation.value;
if (progress == 0) {
Expand Down
15 changes: 5 additions & 10 deletions splash/lib/src/no_splash.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,11 @@ class _NoSplashFactory extends InteractiveInkFeatureFactory {
)
class NoSplash extends InteractiveInkFeature {
NoSplash({
required MaterialInkController controller,
required RenderBox referenceBox,
required Color color,
VoidCallback? onRemoved,
}) : super(
controller: controller,
referenceBox: referenceBox,
color: color,
onRemoved: onRemoved,
);
required super.controller,
required super.referenceBox,
required super.color,
super.onRemoved,
});

static const InteractiveInkFeatureFactory splashFactory = _NoSplashFactory();

Expand Down
6 changes: 2 additions & 4 deletions splash/lib/src/path_splash.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ class _PathRippleFactory extends InteractiveInkFeatureFactory {
class PathSplash extends InteractiveInkFeature {
PathSplash({
required MaterialInkController controller,
required RenderBox referenceBox,
required super.referenceBox,
required Color color,
required TextDirection textDirection,
VoidCallback? onRemoved,
super.onRemoved,
required this.path,
Paint? customPaint,
required this.clip,
Expand All @@ -70,9 +70,7 @@ class PathSplash extends InteractiveInkFeature {
_radius = radius,
super(
controller: controller,
referenceBox: referenceBox,
color: color,
onRemoved: onRemoved,
) {
_progressController = AnimationController(
duration: _kProgressDuration,
Expand Down
Loading

0 comments on commit 821dd40

Please sign in to comment.