Skip to content

Commit d20a6a5

Browse files
FalynskyFalynsky
committed
feat: delete deprecated code
1 parent 22cecbc commit d20a6a5

26 files changed

+97
-568
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ body:
6666
- "2.0.0"
6767
- "2.0.1"
6868
- "2.0.2"
69+
- "2.1.0"
6970
validations:
7071
required: true
7172
- type: dropdown

‎packages/theme_tailor/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 3.0.0
2+
- Removed `requireStaticConst` and `generateStaticGetters`
3+
14
# 2.1.0
25
- Add `themeClassName` and `themeDataClassName` properties to `@TailorMixin`. This addition provides the flexibility for themeGetters to generate a custom theme getter for the extension.
36
- Add migration example from `@Tailor` / `@TailorComponent` to `@TailorMixin` / `@TailorMixinComponent`.

‎packages/theme_tailor/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Flutter 3.0 introduces a new way of theming applications using theme extensions
5959
All of that involves extra coding work that is time-consuming and error-prone, which is why it is advisable to use a generator.
6060

6161
| No code generation | @TailorMixin |
62-
|-----------------------|----------------------------------|
62+
| --------------------- | -------------------------------- |
6363
| ![before][img_before] | ![after][img_after_tailor_mixin] |
6464

6565
The `@TailorMixin` annotation generates a mixin with an implementation of the ThemeExtension class. It adopts a syntax familiar to standard ThemeExtension classes, allowing for enhanced customization of the resulting class.
@@ -328,7 +328,7 @@ To serialize nested themes, declare your config classes as presented in the [Nes
328328
The generator will use properties from build.yaml or default values for null properties in the @TailorMixin annotation.
329329

330330
| Build option | Annotation property | Default | Info |
331-
|-----------------------|---------------------|------------------------|---------------------------------------------------------------------------------------------------------------------------------|
331+
| --------------------- | ------------------- | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
332332
| theme_getter | themeGetter | on_build_context_props | <b>String</b> (ThemeGetter.name):<br><br>none \ on_theme_data \ on_theme_data_props \ on_build_context \ on_build_context_props |
333333
| theme_class_name | themeClassName | null | <b>String</b> For custom Theme if you don't want<br>use Material's Theme. Example: FluentTheme |
334334
| theme_data_class_name | themeDataClassName | null | <b>String</b> For custom ThemeData if you don't want<br>use Material's ThemeData FluentThemeData |
@@ -410,7 +410,7 @@ The old theme extension class looked like this:
410410
```dart
411411
part 'my_theme.tailor.dart';
412412
413-
@Tailor(
413+
@TailorMixin(
414414
themes: ['light', 'dark'],
415415
)
416416
class $_MyTheme {

‎packages/theme_tailor/example/lib/constant_theme.dart

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎packages/theme_tailor/example/lib/migration_from_tailor_to_tailor_mixin.dart

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎packages/theme_tailor/lib/builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:theme_tailor_annotation/theme_tailor_annotation.dart';
88
/// Function used by the build runner
99
Builder themeTailorBuilder(BuilderOptions options) {
1010
return PartBuilder(
11-
[TailorAnnotationsGenerator(Tailor.fromJson(options.config))],
11+
[TailorAnnotationsGenerator(TailorMixin.fromJson(options.config))],
1212
'.tailor.dart',
1313
header: '''
1414
// coverage:ignore-file

‎packages/theme_tailor/lib/src/generator/tailor_annotations_generator.dart

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,13 @@
33
import 'package:analyzer/dart/element/element.dart';
44
import 'package:theme_tailor/src/generator/generator_annotation_matcher.dart';
55
import 'package:theme_tailor/src/generator/tailor_mixin_generator.dart';
6-
import 'package:theme_tailor/src/generator/theme_tailor_generator.dart';
7-
import 'package:theme_tailor/src/util/extension/element_extension.dart';
86
import 'package:theme_tailor_annotation/theme_tailor_annotation.dart';
97

10-
class TailorAnnotationsGenerator extends GeneratorAnnotationMatcher<Tailor> {
8+
class TailorAnnotationsGenerator extends GeneratorAnnotationMatcher<TailorMixin> {
119
const TailorAnnotationsGenerator(this.buildYamlConfig);
1210

13-
final Tailor buildYamlConfig;
11+
final TailorMixin buildYamlConfig;
1412

1513
@override
16-
GeneratorToBuffer<Tailor> getGeneratorFrom(Element element) {
17-
if (element.hasTailorMixinAnnotation) {
18-
return TailorMixinGenerator(buildYamlConfig);
19-
}
20-
return TailorGenerator(buildYamlConfig);
21-
}
14+
GeneratorToBuffer<TailorMixin> getGeneratorFrom(Element element) => TailorMixinGenerator(buildYamlConfig);
2215
}

‎packages/theme_tailor/lib/src/generator/tailor_mixin_generator.dart

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import 'package:theme_tailor/src/util/theme_encoder_helper.dart';
1919
import 'package:theme_tailor_annotation/theme_tailor_annotation.dart';
2020
import 'package:theme_tailor/src/util/extension/scope_extension.dart';
2121

22-
class TailorMixinGenerator extends GeneratorForAnnotatedClass<ImportsData,
23-
TailorMixinAnnotationData, TailorMixinConfig, Tailor> {
22+
class TailorMixinGenerator
23+
extends GeneratorForAnnotatedClass<ImportsData, TailorMixinAnnotationData, TailorMixinConfig, TailorMixin> {
2424
const TailorMixinGenerator(this.buildYamlConfig);
2525

26-
final Tailor buildYamlConfig;
26+
final TailorMixin buildYamlConfig;
2727

2828
@override
2929
ClassElement ensureClassElement(Element element) {
@@ -57,10 +57,8 @@ class TailorMixinGenerator extends GeneratorForAnnotatedClass<ImportsData,
5757
TailorMixinAnnotationData parseAnnotation(ConstantReader annotation) {
5858
final themeGetter = annotation.getFieldOrElse(
5959
'themeGetter',
60-
decode: (o) =>
61-
ThemeGetter.values.byName(o.revive().accessor.split('.').last),
62-
orElse: () =>
63-
buildYamlConfig.themeGetter ?? ThemeGetter.onBuildContextProps,
60+
decode: (o) => ThemeGetter.values.byName(o.revive().accessor.split('.').last),
61+
orElse: () => buildYamlConfig.themeGetter ?? ThemeGetter.onBuildContextProps,
6462
);
6563

6664
final themeClassName = annotation.getFieldOrElse(
@@ -128,8 +126,7 @@ class TailorMixinGenerator extends GeneratorForAnnotatedClass<ImportsData,
128126

129127
/// Fields
130128
final fields = nonStaticFields.map((e) {
131-
final isThemeExtension =
132-
e.type.isThemeExtensionType || e.hasThemeExtensionAnnotation;
129+
final isThemeExtension = e.type.isThemeExtensionType || e.hasThemeExtensionAnnotation;
133130

134131
return Field(
135132
isThemeExtension: isThemeExtension,

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy